Change in osmo-mgw[master]: move MGW endpoint FSM from osmo-bsc to here
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13590 to look at the new patch set (#4). Change subject: move MGW endpoint FSM from osmo-bsc to here .. move MGW endpoint FSM from osmo-bsc to here Move mgw_endpoint_fsm from osmo-bsc here as osmo_mgcpc_ep_fsm. Apply various renames for consistency. Use osmo_tdef from libosmocore instead of osmo-bsc's (so far) local T_defs API. Change T23042 to T2427001, which is a slightly less arbitrary number and slightly more extendable in the future (2427 corresponds to the default MGCP port at osmo-mgw, 001 is the first MGCP timer and so far the only one). Change-Id: I9a3effd38e72841529df6c135c077116981dea36 --- M include/Makefile.am A include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/Makefile.am A src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c M src/libosmo-mgcp-client/mgcp_client_fsm.c 6 files changed, 869 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/90/13590/4 -- To view, visit https://gerrit.osmocom.org/13590 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: I9a3effd38e72841529df6c135c077116981dea36 Gerrit-Change-Number: 13590 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Harald Welte
Change in osmo-mgw[master]: fix: multiple initial CRCX
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13591 to look at the new patch set (#4). Change subject: fix: multiple initial CRCX .. fix: multiple initial CRCX The first CRCX responds with the actual MGW endpoint name that is assigned (at least for rtpbridge/*@mgw requests). If multiple CRCX are scheduled at the same time on a fresh MGW endpoint, both get fired with a '*' and each creates a separate MGW endpoint. Make mgcp_client_endpoint_fsm avoid this, and schedule only one CRCX at first, and the rest once the MGW endpoint name is fixated. It is thus possible to safely issue two osmo_mgcpc_ep_ci_request() at the same time. Change-Id: I92a9944acc96398acd6649f9c3c5badec5dd6dcc --- M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c 1 file changed, 90 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/91/13591/4 -- To view, visit https://gerrit.osmocom.org/13591 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: I92a9944acc96398acd6649f9c3c5badec5dd6dcc Gerrit-Change-Number: 13591 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_18.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 110s] +non-reconnecting test step 0 [client OK, server OK], FD reg 1 [ 110s] --- expout 2019-04-26 20:05:14.33200 + [ 110s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/1/stdout 2019-04-26 20:05:23.35200 + [ 110s] @@ -44,8 +44,6 @@ [ 110s] [OK|OK] Server's read_cb_srv(): received 29(29) bytes: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 [ 110s] [OK|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 [ 110s] [OK|OK] Server's read_cb_srv(): force client disconnect on subsequent call [ 110s] -[OK] Client's read_cb_cli(): callback triggered [ 110s] -[OK] Client's read_cb_cli(): 0-byte read, auto-reconnect will be triggered if enabled [ 110s] non-reconnecting test complete. [ 110s] [ 110s] Stream tests completed [ 110s] 1. testsuite.at:4: 1. stream_test (testsuite.at:4): FAILED (testsuite.at:8) [ 110s] debian/rules:27: recipe for target 'override_dh_auto_test' failed [ 110s] make[1]: *** [override_dh_auto_test] Error 1 [ 110s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 110s] debian/rules:13: recipe for target 'build' failed [ 110s] make: *** [build] Error 2 [ 110s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 110s] [ 110s] sheep82 failed "build libosmo-netif_0.4.0.25.e380.dsc" at Fri Apr 26 20:05:24 UTC 2019. [ 110s] [ 110s] ### VM INTERACTION START ### [ 113s] [ 105.254600] sysrq: SysRq : Power Off [ 113s] [ 105.261337] reboot: Power down [ 113s] ### VM INTERACTION END ### [ 113s] [ 113s] sheep82 failed "build libosmo-netif_0.4.0.25.e380.dsc" at Fri Apr 26 20:05:28 UTC 2019. [ 113s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in libosmocore[master]: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr
Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/13259 ) Change subject: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr .. Patch Set 11: Given the other patches waiting for this on this branch and all the depending patches in other repositories waiting for those, there is a bit of pressure to merge this now. If something else should happen with this, it would be good to make up our minds sooner rather than later... -- To view, visit https://gerrit.osmocom.org/13259 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: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576 Gerrit-Change-Number: 13259 Gerrit-PatchSet: 11 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 26 Apr 2019 19:43:54 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-bsc[master]: fix inter-BSC-HO-incoming for AoIP (2/2)
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13585 to look at the new patch set (#2). Change subject: fix inter-BSC-HO-incoming for AoIP (2/2) .. fix inter-BSC-HO-incoming for AoIP (2/2) For AoIP, the AoIP Transport Layer Address IE must be included in the Handover Request Acknowledge message, so the MSC can send RTP to the right place. Add this IE for AoIP. Depends: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576 (libosmocore) Depends: Id617265337f09dfb6ddfe111ef5e578cd3dc9f63 (libosmocore) Change-Id: Ia05e37da125eb6e7b7be9b974b73261bd72de1f4 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 31 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/13585/2 -- To view, visit https://gerrit.osmocom.org/13585 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: Ia05e37da125eb6e7b7be9b974b73261bd72de1f4 Gerrit-Change-Number: 13585 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-bsc[master]: fix inter-BSC-HO-incoming for AoIP (1/2)
Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/13797
Change subject: fix inter-BSC-HO-incoming for AoIP (1/2)
..
fix inter-BSC-HO-incoming for AoIP (1/2)
Move the HO_ST_WAIT_MGW_ENDPOINT_TO_MSC state up to right after the lchan is
done establishing. For AoIP, the local RTP address towards the MSC already
needs to be known before the Handover Request Acknowledge is sent, so the AoIP
Transport Layer Address IE can be included. This patch only modifies the
handover FSM, a subsequent patch adds the IE.
Change-Id: I00c18b78573386145af71c4b39f7f22aec24579b
---
M include/osmocom/bsc/handover_fsm.h
M src/osmo-bsc/handover_fsm.c
2 files changed, 105 insertions(+), 86 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/13797/1
diff --git a/include/osmocom/bsc/handover_fsm.h
b/include/osmocom/bsc/handover_fsm.h
index 4db0890..7c2145e 100644
--- a/include/osmocom/bsc/handover_fsm.h
+++ b/include/osmocom/bsc/handover_fsm.h
@@ -28,10 +28,10 @@
HO_ST_NOT_STARTED,
HO_ST_WAIT_LCHAN_ACTIVE,
+ HO_ST_WAIT_MGW_ENDPOINT_TO_MSC,
HO_ST_WAIT_RR_HO_DETECT,
HO_ST_WAIT_RR_HO_COMPLETE,
HO_ST_WAIT_LCHAN_ESTABLISHED,
- HO_ST_WAIT_MGW_ENDPOINT_TO_MSC,
/* The inter-BSC Outgoing Handover FSM has completely separate states,
but since it makes sense for it
* to also live in conn->ho.fi, it should share the same event enum.
From there it is merely
@@ -46,11 +46,11 @@
HO_EV_LCHAN_ACTIVE,
HO_EV_LCHAN_ESTABLISHED,
HO_EV_LCHAN_ERROR,
+ HO_EV_MSC_MGW_OK,
+ HO_EV_MSC_MGW_FAIL,
HO_EV_RR_HO_DETECT,
HO_EV_RR_HO_COMPLETE,
HO_EV_RR_HO_FAIL,
- HO_EV_MSC_MGW_OK,
- HO_EV_MSC_MGW_FAIL,
HO_EV_CONN_RELEASING,
HO_OUT_EV_BSSMAP_HO_COMMAND,
diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c
index 0d1449f..6a07fbe 100644
--- a/src/osmo-bsc/handover_fsm.c
+++ b/src/osmo-bsc/handover_fsm.c
@@ -162,10 +162,10 @@
static const struct osmo_tdef_state_timeout ho_fsm_timeouts[32] = {
[HO_ST_WAIT_LCHAN_ACTIVE] = { .T = 23042 },
+ [HO_ST_WAIT_MGW_ENDPOINT_TO_MSC] = { .T = 23042 },
[HO_ST_WAIT_RR_HO_DETECT] = { .T = 23042 },
[HO_ST_WAIT_RR_HO_COMPLETE] = { .T = 23042 },
[HO_ST_WAIT_LCHAN_ESTABLISHED] = { .T = 23042 },
- [HO_ST_WAIT_MGW_ENDPOINT_TO_MSC] = { .T = 23042 },
[HO_OUT_ST_WAIT_HO_COMMAND] = { .T = 7 },
[HO_OUT_ST_WAIT_CLEAR] = { .T = 8 },
};
@@ -877,10 +877,24 @@
static void ho_fsm_wait_lchan_active(struct osmo_fsm_inst *fi, uint32_t event,
void *data)
{
struct gsm_subscriber_connection *conn = ho_fi_conn(fi);
+ struct handover *ho = &conn->ho;
switch (event) {
case HO_EV_LCHAN_ACTIVE:
- ho_fsm_state_chg(HO_ST_WAIT_RR_HO_DETECT);
+ /* - If the lchan is voiceless, no need to even think about the
MGW.
+* - If this is an intra-BSC Handover, we already have an RTP
stream towards the MSC and aren't
+* touching it.
+* - If we're on SCCPlite, the MSC manages the MGW endpoint,
all we do is the BTS side CI, so we can
+* skip the part that would CRCX towards the MSC.
+* So create an MSC side endpoint CI only if a voice lchan is
established for an incoming inter-BSC
+* handover on AoIP. Otherwise go on to send a Handover Command
and wait for the Detect.
+*/
+ if (ho->new_lchan->activate.info.requires_voice_stream
+ && (ho->scope & HO_INTER_BSC_IN)
+ && gscon_is_aoip(conn))
+ ho_fsm_state_chg(HO_ST_WAIT_MGW_ENDPOINT_TO_MSC);
+ else
+ ho_fsm_state_chg(HO_ST_WAIT_RR_HO_DETECT);
return;
case HO_EV_LCHAN_ERROR:
@@ -893,6 +907,75 @@
}
}
+/* Only for voice, only for inter-BSC Handover into this BSC, and only for
AoIP:
+ *
+ * Establish the MGW endpoint CI that points towards the MSC. This needs to
happen after the lchan (lchan_rtp_fsm) has
+ * created an MGW endpoint with the first CRCX, so that an endpoint is
available, and before sending the Handover
+ * Request Acknowledge, so that the RTP address and port established towards
the MSC can be included in the Handover
+ * Request Acknowledge message.
+ * (For SCCPlite, the MSC manages the CN side endpoint CI itself, and we don't
need to send any RTP address in the
+ * Handover Request Acknowledge.)
+ *
+ * Actually, it should be possible to kick this off even above in
handover_start_inter_bsc_in(), to do the CRCX towards
+ * the MSC at the same time as establishing the lchan. The
gscon_ensure_mgw_endpoint() doesn't care which one of
+ * lchan_rtp_fsm or handover_start_inter_bsc_in() calls it first. The benefit
would be that we'
Change in osmo-bsc[master]: use libosmocore osmo_tdef
Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/13795
Change subject: use libosmocore osmo_tdef
..
use libosmocore osmo_tdef
Move the T_defs API to libosmocore as osmo_tdefs: remove the local T_defs API
and use libosmocore's osmo_tdef* API instead.
The root reason is moving the mgw_endpoint_fsm to libosmo-mgcp-client to be
able to use it in osmo-msc for inter-MSC handover.
When adding osmo_tdef, the new concept of timer groups was added to the API. It
would make sense to apply group names here as well, but do not modify the VTY
configuration for timers. The future might bring separate groups (or not).
Depends: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 (libosmocore)
Change-Id: I66674a5d8403d820038762888c846bae10ceac58
---
M include/osmocom/bsc/Makefile.am
M include/osmocom/bsc/gsm_data.h
D include/osmocom/bsc/gsm_timers.h
M include/osmocom/bsc/mgw_endpoint_fsm.h
M src/ipaccess/Makefile.am
M src/osmo-bsc/Makefile.am
M src/osmo-bsc/abis_om2000.c
M src/osmo-bsc/abis_rsl.c
M src/osmo-bsc/assignment_fsm.c
M src/osmo-bsc/bsc_subscr_conn_fsm.c
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c
M src/osmo-bsc/bts_siemens_bs11.c
M src/osmo-bsc/gsm_data.c
D src/osmo-bsc/gsm_timers.c
D src/osmo-bsc/gsm_timers_vty.c
M src/osmo-bsc/handover_fsm.c
M src/osmo-bsc/lchan_fsm.c
M src/osmo-bsc/lchan_rtp_fsm.c
M src/osmo-bsc/mgw_endpoint_fsm.c
M src/osmo-bsc/net_init.c
M src/osmo-bsc/paging.c
M src/utils/Makefile.am
M tests/abis/Makefile.am
M tests/bsc/Makefile.am
M tests/gsm0408/Makefile.am
M tests/handover/Makefile.am
M tests/nanobts_omlattr/Makefile.am
M tests/nanobts_omlattr/nanobts_omlattr_test.c
29 files changed, 94 insertions(+), 468 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/13795/1
diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am
index 044fdc9..21e53d7 100644
--- a/include/osmocom/bsc/Makefile.am
+++ b/include/osmocom/bsc/Makefile.am
@@ -20,7 +20,6 @@
gsm_04_08_rr.h \
gsm_04_80.h \
gsm_data.h \
- gsm_timers.h \
handover.h \
handover_cfg.h \
handover_decision.h \
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index dc133e1..7b813a6 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -17,6 +17,7 @@
#include
#include
#include
+#include
#include
@@ -31,7 +32,6 @@
#include
#include
#include
-#include
#include
#define GSM_T3122_DEFAULT 10
@@ -1495,7 +1495,7 @@
struct llist_head bts_rejected;
/* shall reference gsm_network_T[] */
- struct T_def *T_defs;
+ struct osmo_tdef *T_defs;
enum gsm_chan_t ctype_by_chreq[_NUM_CHREQ_T];
diff --git a/include/osmocom/bsc/gsm_timers.h b/include/osmocom/bsc/gsm_timers.h
deleted file mode 100644
index 699c461..000
--- a/include/osmocom/bsc/gsm_timers.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* API to define Tnnn timers globally, configure in VTY and use for FSM state
changes. */
-#pragma once
-
-#include
-#include
-
-struct osmo_fsm_inst;
-struct vty;
-
-enum T_unit {
- T_S = 0,/*< most T are in seconds, keep 0 as default. */
- T_MS, /*< milliseconds */
- T_M,/*< minutes */
- T_CUSTOM,
-};
-
-extern const struct value_string T_unit_names[];
-static inline const char *T_unit_name(enum T_unit val)
-{ return get_value_string(T_unit_names, val); }
-
-/* Define a GSM timer of the form Tnnn, with unit, default value and doc
string. */
-struct T_def {
- const int T; /*< T1234 number */
- const int default_val; /*< timeout duration (according to unit),
default value. */
- const enum T_unit unit;
- const char *desc;
- int val; /*< currently active value, e.g. set by user config. */
-};
-
-/* Iterate an array of struct T_def, the last item should be fully zero, i.e.
"{}" */
-#define for_each_T_def(d, T_defs) \
- for (d = T_defs; d && (d->T || d->default_val || d->desc); d++)
-
-int T_def_get(const struct T_def *T_defs, int T, enum T_unit as_unit, int
val_if_not_present);
-void T_defs_reset(struct T_def *T_defs);
-struct T_def *T_def_get_entry(struct T_def *T_defs, int T);
-
-void T_defs_vty_init(struct T_def *T_defs, int cfg_parent_node);
-void T_defs_vty_write(struct vty *vty, const char *indent);
-struct T_def *parse_T_arg(struct vty *vty, const char *T_str);
-
-struct state_timeout {
- int T;
- bool keep_timer;
-};
-
-const struct state_timeout *get_state_timeout(uint32_t state,
- const struct state_timeout
*timeouts_array);
-
-#define fsm_inst_state_chg_T(fi, state, timeouts_array, T_defs,
default_timeout) \
- _fsm_inst_state_chg_T(fi, state, timeouts_array, T_defs,
default_timeout, \
- __FILE__, __LINE__)
-int _fsm_inst_state_chg_T(struct osmo
Change in osmo-hlr[master]: add missing error log: invalid IMSI
Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/13587 ) Change subject: add missing error log: invalid IMSI .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/13587/1/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/13587/1/src/hlr.c@537 PS1, Line 537: > What is the benefit of using osmo_quote_str() here? […] The point is that the strlen() is invalid. So the IMSI might be empty, or something else might be odd, maybe random memory and invalid characters? osmo_quote_str() guarantees outputting something useful in all cases. -- To view, visit https://gerrit.osmocom.org/13587 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: I65e9ecac06dc6d1abb9802d621c385d3b4fab83a Gerrit-Change-Number: 13587 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 26 Apr 2019 19:03:07 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-hlr[master]: add missing error log: invalid IMSI
Neels Hofmeyr has submitted this change and it was merged. (
https://gerrit.osmocom.org/13587 )
Change subject: add missing error log: invalid IMSI
..
add missing error log: invalid IMSI
Change-Id: I65e9ecac06dc6d1abb9802d621c385d3b4fab83a
---
M src/hlr.c
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
diff --git a/src/hlr.c b/src/hlr.c
index 422a56d..19cfebb 100644
--- a/src/hlr.c
+++ b/src/hlr.c
@@ -454,8 +454,10 @@
/* 3GPP TS 23.003 Section 2.2 clearly states that an IMSI with less
than 5
* digits is impossible. Even 5 digits is a highly theoretical case */
- if (strlen(gsup.imsi) < 5)
+ if (strlen(gsup.imsi) < 5) {
+ LOGP(DMAIN, LOGL_ERROR, "IMSI too short: %s\n",
osmo_quote_str(gsup.imsi, -1));
return gsup_send_err_reply(conn, gsup.imsi, gsup.message_type,
GMM_CAUSE_INV_MAND_INFO);
+ }
switch (gsup.message_type) {
/* requests sent to us */
--
To view, visit https://gerrit.osmocom.org/13587
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: I65e9ecac06dc6d1abb9802d621c385d3b4fab83a
Gerrit-Change-Number: 13587
Gerrit-PatchSet: 3
Gerrit-Owner: Neels Hofmeyr
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Vadim Yanitskiy
Change in osmo-hlr[master]: fix error logging for GSUP route
Neels Hofmeyr has submitted this change and it was merged. (
https://gerrit.osmocom.org/13517 )
Change subject: fix error logging for GSUP route
..
fix error logging for GSUP route
The addr may not be nul terminated.
Change-Id: Ie4def16008af573ed2e1367d9da50c3d2b5a71ef
---
M src/gsup_send.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/src/gsup_send.c b/src/gsup_send.c
index 889cf63..247a7e7 100644
--- a/src/gsup_send.c
+++ b/src/gsup_send.c
@@ -42,7 +42,7 @@
conn = gsup_route_find(gs, addr, addrlen);
if (!conn) {
- DEBUGP(DLGSUP, "Cannot find route for addr %s\n", addr);
+ DEBUGP(DLGSUP, "Cannot find route for addr %s\n",
osmo_quote_str((const char*)addr, addrlen));
msgb_free(msg);
return -ENODEV;
}
--
To view, visit https://gerrit.osmocom.org/13517
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: Ie4def16008af573ed2e1367d9da50c3d2b5a71ef
Gerrit-Change-Number: 13517
Gerrit-PatchSet: 4
Gerrit-Owner: Neels Hofmeyr
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Vadim Yanitskiy
Gerrit-Reviewer: osmith
Change in osmo-msc[master]: vlr subscr get/put: also check against NULL
Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/13745 ) Change subject: vlr subscr get/put: also check against NULL .. vlr subscr get/put: also check against NULL Change-Id: I36929a4ba4abb46909181068d1d0af967b1f5a94 --- M include/osmocom/msc/vlr.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 92ebda1..ce6a232 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -399,9 +399,9 @@ #define vlr_subscr_put(VSUB, USE) vlr_subscr_put_src(VSUB, USE, __FILE__, __LINE__) #define vlr_subscr_get_src(VSUB, USE, SRCFILE, SRCLINE) \ - OSMO_ASSERT(_osmo_use_count_get_put(&(VSUB)->use_count, USE, 1, SRCFILE, SRCLINE) == 0) + OSMO_ASSERT((VSUB) && _osmo_use_count_get_put(&(VSUB)->use_count, USE, 1, SRCFILE, SRCLINE) == 0) #define vlr_subscr_put_src(VSUB, USE, SRCFILE, SRCLINE) \ - OSMO_ASSERT(_osmo_use_count_get_put(&(VSUB)->use_count, USE, -1, SRCFILE, SRCLINE) == 0) + OSMO_ASSERT((VSUB) && _osmo_use_count_get_put(&(VSUB)->use_count, USE, -1, SRCFILE, SRCLINE) == 0) void vlr_subscr_free(struct vlr_subscr *vsub); int vlr_subscr_alloc_tmsi(struct vlr_subscr *vsub); -- To view, visit https://gerrit.osmocom.org/13745 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: I36929a4ba4abb46909181068d1d0af967b1f5a94 Gerrit-Change-Number: 13745 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr
Change in osmo-trx[master]: lms: Improve log during flush recv error
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/13783 )
Change subject: lms: Improve log during flush recv error
..
lms: Improve log during flush recv error
Change-Id: Id45d42599738efd6a5d89787c75779838a979330
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
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 064d742..b924fa7 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -462,7 +462,7 @@
rc = LMS_RecvStream(&m_lms_stream_rx[0], &buffer[0], len,
&rx_metadata, 100);
LOGC(DDEV, DEBUG) << "Flush: Recv buffer of len " << rc << " at
" << std::hex << rx_metadata.timestamp;
if (rc != len) {
- LOGC(DDEV, ALERT) << "LMS: Device receive timed out";
+ LOGC(DDEV, ALERT) << "Flush: Device receive timed out";
return false;
}
--
To view, visit https://gerrit.osmocom.org/13783
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: Id45d42599738efd6a5d89787c75779838a979330
Gerrit-Change-Number: 13783
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-trx[master]: lms: Log underrun/overrun events
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/13786 )
Change subject: lms: Log underrun/overrun events
..
lms: Log underrun/overrun events
Change-Id: I8c6b1d3e8515153e5d4079cc6620901ef8ce2449
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 10 insertions(+), 2 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 0cd41d3..d0c8e19 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -573,12 +573,20 @@
{
lms_stream_status_t status;
if (LMS_GetStreamStatus(&m_lms_stream_rx[chan], &status) == 0) {
- if (status.underrun > m_last_rx_underruns[chan])
+ if (status.underrun > m_last_rx_underruns[chan]) {
*underrun = true;
+ LOGC(DDEV, ERROR) << "chan " << chan << ": recv
Underrun! ("
+ << m_last_rx_underruns[chan] << " -> "
+ << status.underrun << ")";
+ }
m_last_rx_underruns[chan] = status.underrun;
- if (status.overrun > m_last_rx_overruns[chan])
+ if (status.overrun > m_last_rx_overruns[chan]) {
*overrun = true;
+ LOGC(DDEV, ERROR) << "chan " << chan << ": recv
Overrun! ("
+ << m_last_rx_overruns[chan] << " -> "
+ << status.overrun << ")";
+ }
m_last_rx_overruns[chan] = status.overrun;
}
}
--
To view, visit https://gerrit.osmocom.org/13786
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: I8c6b1d3e8515153e5d4079cc6620901ef8ce2449
Gerrit-Change-Number: 13786
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-trx[master]: lms: flush_recv: alloc buf on stack instead of heap
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/13782 )
Change subject: lms: flush_recv: alloc buf on stack instead of heap
..
lms: flush_recv: alloc buf on stack instead of heap
No need to use the heap here since buffer is only used as a temporary
trash. Using the stack is quicker.
Change-Id: Iede8dc0903ee3865a52c8e2fd811bcde444fee33
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 1 insertion(+), 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 05904e8..064d742 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -450,7 +450,7 @@
{
#define CHUNK 625
int len = CHUNK * tx_sps;
- short *buffer = new short[len * 2];
+ short *buffer = (short*) alloca(sizeof(short) * len * 2);
int rc;
lms_stream_meta_t rx_metadata = {};
rx_metadata.flushPartialPacket = false;
@@ -463,7 +463,6 @@
LOGC(DDEV, DEBUG) << "Flush: Recv buffer of len " << rc << " at
" << std::hex << rx_metadata.timestamp;
if (rc != len) {
LOGC(DDEV, ALERT) << "LMS: Device receive timed out";
- delete[] buffer;
return false;
}
@@ -471,7 +470,6 @@
}
LOGC(DDEV, INFO) << "Initial timestamp " << ts_initial << std::endl;
- delete[] buffer;
return true;
}
--
To view, visit https://gerrit.osmocom.org/13782
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: Iede8dc0903ee3865a52c8e2fd811bcde444fee33
Gerrit-Change-Number: 13782
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-CC: Max
Change in osmo-trx[master]: Move duplicated thread_enable_cancel to CommonLibs
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/13785 )
Change subject: Move duplicated thread_enable_cancel to CommonLibs
..
Move duplicated thread_enable_cancel to CommonLibs
Change-Id: I1a479b59bdda01233273dfa919bd678edbe34708
---
M CommonLibs/Threads.cpp
M CommonLibs/Threads.h
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/uhd/UHDDevice.cpp
4 files changed, 7 insertions(+), 12 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/CommonLibs/Threads.cpp b/CommonLibs/Threads.cpp
index 2988e12..c056d69 100644
--- a/CommonLibs/Threads.cpp
+++ b/CommonLibs/Threads.cpp
@@ -122,6 +122,12 @@
}
}
+void thread_enable_cancel(bool cancel)
+{
+ cancel ? pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) :
+pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
+}
+
void Thread::start(void *(*task)(void*), void *arg)
{
assert(mThread==((pthread_t)0));
diff --git a/CommonLibs/Threads.h b/CommonLibs/Threads.h
index 3b76985..4c5b9ee 100644
--- a/CommonLibs/Threads.h
+++ b/CommonLibs/Threads.h
@@ -142,6 +142,7 @@
thread.start((void *(*)(void*))function, (void*)argument);
void set_selfthread_name(const char *name);
+void thread_enable_cancel(bool cancel);
/** A C++ wrapper for pthread threads. */
class Thread {
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index b924fa7..0cd41d3 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -90,12 +90,6 @@
LOGLV(DLMS, lvl_map[lvl]) << msg;
}
-static void thread_enable_cancel(bool cancel)
-{
- cancel ? pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) :
-pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-}
-
static void print_range(const char* name, lms_range_t *range)
{
LOGC(DDEV, INFO) << name << ": Min=" << range->min << " Max=" <<
range->max
diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp
b/Transceiver52M/device/uhd/UHDDevice.cpp
index 765150f..46284e5 100644
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -357,12 +357,6 @@
}
#endif
-static void thread_enable_cancel(bool cancel)
-{
- cancel ? pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) :
-pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-}
-
uhd_device::uhd_device(size_t tx_sps, size_t rx_sps,
InterfaceType iface, size_t chans, double lo_offset,
const std::vector& tx_paths,
--
To view, visit https://gerrit.osmocom.org/13785
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: I1a479b59bdda01233273dfa919bd678edbe34708
Gerrit-Change-Number: 13785
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-trx[master]: lms: Remove unused var m_last_tx_overruns
Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/13788 ) Change subject: lms: Remove unused var m_last_tx_overruns .. lms: Remove unused var m_last_tx_overruns Change-Id: I2104205b2af7cd6c86075d5cc4f0f36bde5e5311 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index e971ad4..e65c93d 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -55,7 +55,6 @@ m_last_rx_underruns.resize(chans, 0); m_last_rx_overruns.resize(chans, 0); m_last_tx_underruns.resize(chans, 0); - m_last_tx_overruns.resize(chans, 0); } LMSDevice::~LMSDevice() diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index d1cb12a..4bf2b32 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -51,7 +51,6 @@ std::vector m_last_rx_underruns; std::vector m_last_rx_overruns; std::vector m_last_tx_underruns; - std::vector m_last_tx_overruns; double actualSampleRate;///< the actual USRP sampling rate -- To view, visit https://gerrit.osmocom.org/13788 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: I2104205b2af7cd6c86075d5cc4f0f36bde5e5311 Gerrit-Change-Number: 13788 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-trx[master]: lms: Remove references to ALERT loglevel
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/13787 )
Change subject: lms: Remove references to ALERT loglevel
..
lms: Remove references to ALERT loglevel
ALERT log level is not Osmocom standard level, it's just a define in
osmo-trx to keep compatibility with old code.
Same goes for one reference to "ERR" intead of "ERROR".
Change-Id: I0e171a8ac8a8bfa804ac97fba3d73efcfa6424b4
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 21 insertions(+), 21 deletions(-)
Approvals:
Jenkins Builder: Verified
Max: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index d0c8e19..e971ad4 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -234,7 +234,7 @@
/* configure antennas */
if (!set_antennas()) {
- LOGC(DDEV, ALERT) << "LMS antenna setting failed";
+ LOGC(DDEV, FATAL) << "LMS antenna setting failed";
goto out_close;
}
@@ -245,7 +245,7 @@
return NORMAL;
out_close:
- LOGC(DDEV, ALERT) << "Error in LMS open, closing: " <<
LMS_GetLastErrorMessage();
+ LOGC(DDEV, FATAL) << "Error in LMS open, closing: " <<
LMS_GetLastErrorMessage();
LMS_Close(m_lms_dev);
m_lms_dev = NULL;
return -1;
@@ -456,7 +456,7 @@
rc = LMS_RecvStream(&m_lms_stream_rx[0], &buffer[0], len,
&rx_metadata, 100);
LOGC(DDEV, DEBUG) << "Flush: Recv buffer of len " << rc << " at
" << std::hex << rx_metadata.timestamp;
if (rc != len) {
- LOGC(DDEV, ALERT) << "Flush: Device receive timed out";
+ LOGC(DDEV, ERROR) << "Flush: Device receive timed out";
return false;
}
@@ -472,18 +472,18 @@
int idx;
if (chan >= rx_paths.size()) {
- LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+ LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;
return false;
}
idx = get_ant_idx(ant, LMS_CH_RX, chan);
if (idx < 0) {
- LOGC(DDEV, ALERT) << "Invalid Rx Antenna";
+ LOGC(DDEV, ERROR) << "Invalid Rx Antenna";
return false;
}
if (LMS_SetAntenna(m_lms_dev, LMS_CH_RX, chan, idx) < 0) {
- LOGC(DDEV, ALERT) << "Unable to set Rx Antenna";
+ LOGC(DDEV, ERROR) << "Unable to set Rx Antenna";
}
return true;
@@ -495,18 +495,18 @@
int idx;
if (chan >= rx_paths.size()) {
- LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+ LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;
return "";
}
idx = LMS_GetAntenna(m_lms_dev, LMS_CH_RX, chan);
if (idx < 0) {
- LOGC(DDEV, ALERT) << "Error getting Rx Antenna";
+ LOGC(DDEV, ERROR) << "Error getting Rx Antenna";
return "";
}
if (LMS_GetAntennaList(m_lms_dev, LMS_CH_RX, chan, name_list) < idx) {
- LOGC(DDEV, ALERT) << "Error getting Rx Antenna List";
+ LOGC(DDEV, ERROR) << "Error getting Rx Antenna List";
return "";
}
@@ -518,18 +518,18 @@
int idx;
if (chan >= tx_paths.size()) {
- LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+ LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;
return false;
}
idx = get_ant_idx(ant, LMS_CH_TX, chan);
if (idx < 0) {
- LOGC(DDEV, ALERT) << "Invalid Rx Antenna";
+ LOGC(DDEV, ERROR) << "Invalid Rx Antenna";
return false;
}
if (LMS_SetAntenna(m_lms_dev, LMS_CH_TX, chan, idx) < 0) {
- LOGC(DDEV, ALERT) << "Unable to set Rx Antenna";
+ LOGC(DDEV, ERROR) << "Unable to set Rx Antenna";
}
return true;
@@ -541,18 +541,18 @@
int idx;
if (chan >= tx_paths.size()) {
- LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+ LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;
return "";
}
idx = LMS_GetAntenna(m_lms_dev, LMS_CH_TX, chan);
if (idx < 0) {
- LOGC(DDEV, ALERT) << "Error getting Tx Antenna";
+ LOGC(DDEV, ERROR) << "Error getting Tx Antenna";
return "";
}
if (LMS_GetAntennaList(m_lms_dev, LMS_CH_TX, chan, name_list) < idx) {
- LOGC(DDEV, ALERT) << "Error getting Tx Antenna List";
+ LOGC(DDEV, ERROR) << "Error get
Change in osmo-trx[master]: cosmetic: Threads.h: Remove trailing whitespace
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/13784 )
Change subject: cosmetic: Threads.h: Remove trailing whitespace
..
cosmetic: Threads.h: Remove trailing whitespace
Change-Id: I0ae6e435a7f0480c3eaa08dccfe824456f33b015
---
M CommonLibs/Threads.h
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
Max: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/CommonLibs/Threads.h b/CommonLibs/Threads.h
index 857c5d9..3b76985 100644
--- a/CommonLibs/Threads.h
+++ b/CommonLibs/Threads.h
@@ -55,7 +55,7 @@
#define OBJDCOUT(text) {}
#else
#define DCOUT(text) { COUT(__FILE__ << ":" << __LINE__ << " " << text); }
-#define OBJDCOUT(text) { DCOUT(this << " " << text); }
+#define OBJDCOUT(text) { DCOUT(this << " " << text); }
#endif
//@}
//@}
@@ -152,7 +152,7 @@
pthread_attr_t mAttrib;
// FIXME -- Can this be reduced now?
size_t mStackSize;
-
+
public:
--
To view, visit https://gerrit.osmocom.org/13784
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: I0ae6e435a7f0480c3eaa08dccfe824456f33b015
Gerrit-Change-Number: 13784
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-trx[master]: lms: Catch and log dropped packets by HW during recv
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/13789 )
Change subject: lms: Catch and log dropped packets by HW during recv
..
lms: Catch and log dropped packets by HW during recv
Change-Id: I23554d95b0aff585024610fc12920c9da4f3ba9e
---
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/lms/LMSDevice.h
2 files changed, 9 insertions(+), 0 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 e65c93d..7071589 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -54,6 +54,7 @@
m_last_rx_underruns.resize(chans, 0);
m_last_rx_overruns.resize(chans, 0);
+ m_last_rx_dropped.resize(chans, 0);
m_last_tx_underruns.resize(chans, 0);
}
@@ -587,6 +588,13 @@
<< status.overrun << ")";
}
m_last_rx_overruns[chan] = status.overrun;
+
+ if (status.droppedPackets > m_last_rx_dropped[chan]) {
+ LOGC(DDEV, ERROR) << "chan " << chan << ": recv Dropped
packets by HW! ("
+ << m_last_rx_dropped[chan] << " -> "
+ << status.droppedPackets << ")";
+ }
+ m_last_rx_dropped[chan] = m_last_rx_overruns[chan];
}
}
diff --git a/Transceiver52M/device/lms/LMSDevice.h
b/Transceiver52M/device/lms/LMSDevice.h
index 4bf2b32..225839d 100644
--- a/Transceiver52M/device/lms/LMSDevice.h
+++ b/Transceiver52M/device/lms/LMSDevice.h
@@ -50,6 +50,7 @@
std::vector m_last_rx_underruns;
std::vector m_last_rx_overruns;
+ std::vector m_last_rx_dropped;
std::vector m_last_tx_underruns;
double actualSampleRate;///< the actual USRP sampling rate
--
To view, visit https://gerrit.osmocom.org/13789
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: I23554d95b0aff585024610fc12920c9da4f3ba9e
Gerrit-Change-Number: 13789
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-trx[master]: lms: Catch and log dropped packets by HW during recv
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13789 ) Change subject: lms: Catch and log dropped packets by HW during recv .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13789 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: I23554d95b0aff585024610fc12920c9da4f3ba9e Gerrit-Change-Number: 13789 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Fri, 26 Apr 2019 16:18:38 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-trx[master]: lms: Remove unused var m_last_tx_overruns
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13788 ) Change subject: lms: Remove unused var m_last_tx_overruns .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13788 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: I2104205b2af7cd6c86075d5cc4f0f36bde5e5311 Gerrit-Change-Number: 13788 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 16:14:04 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-trx[master]: lms: Remove references to ALERT loglevel
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13787 ) Change subject: lms: Remove references to ALERT loglevel .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13787 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: I0e171a8ac8a8bfa804ac97fba3d73efcfa6424b4 Gerrit-Change-Number: 13787 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 16:13:45 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-trx[master]: lms: Log underrun/overrun events
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13786 ) Change subject: lms: Log underrun/overrun events .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13786 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: I8c6b1d3e8515153e5d4079cc6620901ef8ce2449 Gerrit-Change-Number: 13786 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Fri, 26 Apr 2019 16:11:30 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-trx[master]: Move duplicated thread_enable_cancel to CommonLibs
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13785 ) Change subject: Move duplicated thread_enable_cancel to CommonLibs .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13785 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: I1a479b59bdda01233273dfa919bd678edbe34708 Gerrit-Change-Number: 13785 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Fri, 26 Apr 2019 16:11:08 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-trx[master]: cosmetic: Threads.h: Remove trailing whitespace
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13784 ) Change subject: cosmetic: Threads.h: Remove trailing whitespace .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13784 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: I0ae6e435a7f0480c3eaa08dccfe824456f33b015 Gerrit-Change-Number: 13784 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 16:10:33 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-trx[master]: lms: flush_recv: alloc buf on stack instead of heap
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13782 ) Change subject: lms: flush_recv: alloc buf on stack instead of heap .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13782 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: Iede8dc0903ee3865a52c8e2fd811bcde444fee33 Gerrit-Change-Number: 13782 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 16:09:47 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-trx[master]: lms: Improve log during flush recv error
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13783 ) Change subject: lms: Improve log during flush recv error .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13783 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: Id45d42599738efd6a5d89787c75779838a979330 Gerrit-Change-Number: 13783 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Fri, 26 Apr 2019 16:10:26 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: libmsc/db.c: fix storing SMS with empty TP-User-Data
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13630 ) Change subject: libmsc/db.c: fix storing SMS with empty TP-User-Data .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13630 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: If0b2bb557118c5f0e520a2e6c2816336f6028661 Gerrit-Change-Number: 13630 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 16:05:57 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: jenkins docker: Install lcov and lcov-cobertura
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13551 ) Change subject: jenkins docker: Install lcov and lcov-cobertura .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13551 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: I26896a9807e756b1f935cd3ed524d25ee22efaed Gerrit-Change-Number: 13551 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 16:04:17 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: ansible: Document how to use ProxyJump to access ipv6 nodes
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13794 ) Change subject: ansible: Document how to use ProxyJump to access ipv6 nodes .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/13794 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: I31b8f8ea5ed84a676c97ad2f6802be19f0e394d9 Gerrit-Change-Number: 13794 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 26 Apr 2019 16:03:49 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: ansible: Document how to use ProxyJump to access ipv6 nodes
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13794 ) Change subject: ansible: Document how to use ProxyJump to access ipv6 nodes .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13794 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: I31b8f8ea5ed84a676c97ad2f6802be19f0e394d9 Gerrit-Change-Number: 13794 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 26 Apr 2019 16:03:47 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: ansible: Document how to use ProxyJump to access ipv6 nodes
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13794 ) Change subject: ansible: Document how to use ProxyJump to access ipv6 nodes .. ansible: Document how to use ProxyJump to access ipv6 nodes Change-Id: I31b8f8ea5ed84a676c97ad2f6802be19f0e394d9 --- M ansible/README.md 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ansible/README.md b/ansible/README.md index 15c6164..f3185ec 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -18,3 +18,15 @@ `ansible-playbook -i hosts setup-jenkins-slave.yml` Further information on this job and around the setup can be found on the redmine wiki. + +If you don't have access to an IPv6 network from your local host, then you can +use an ssh proxy to updates hosts in the `hosts` files being accessed only +through an IPv6 addr. Your ssh proxy must of course have an IPv6 address able to +reach the destination host. + +example `.ssh/config`: +``` +Host 2a01:4f8:13b:828::1:* +ProxyJump proxyu...@myhostproxy.com:22 +User root +``` -- To view, visit https://gerrit.osmocom.org/13794 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: I31b8f8ea5ed84a676c97ad2f6802be19f0e394d9 Gerrit-Change-Number: 13794 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte
Change in osmo-ci[master]: generalize the install-poky-sdk role to support multiple sdks
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13793 ) Change subject: generalize the install-poky-sdk role to support multiple sdks .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/13793 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: I35f34a089311808cb21a064dd50e41cd1887b320 Gerrit-Change-Number: 13793 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Apr 2019 14:37:45 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: osmocom-jenkins-slave: fix jessie-backports as it got deprecated
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13792 ) Change subject: osmocom-jenkins-slave: fix jessie-backports as it got deprecated .. Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/13792/1/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml File ansible/roles/osmocom-jenkins-slave/tasks/debian.yml: https://gerrit.osmocom.org/#/c/13792/1/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml@20 PS1, Line 20: - name: stop checking release validity for old stable typo: statble. -- To view, visit https://gerrit.osmocom.org/13792 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: Idae47a6529f6a870e29ab688c3479b7ef4ba200a Gerrit-Change-Number: 13792 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Apr 2019 14:37:14 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-ci[master]: osmocom-jenkins-slave: fix jessie-backports as it got deprecated
Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/13792 ) Change subject: osmocom-jenkins-slave: fix jessie-backports as it got deprecated .. osmocom-jenkins-slave: fix jessie-backports as it got deprecated Change-Id: Idae47a6529f6a870e29ab688c3479b7ef4ba200a --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 641c6f3..38228ec 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -17,9 +17,15 @@ - fakeroot when: install_jenkins_utilities +- name: stop checking release validity for old stable + copy: +content: 'Acquire::Check-Valid-Until "false";' +dest: '/etc/apt/apt.conf.d/90-stop-check-release-validity' + when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' + - name: enable backports for jessie apt_repository: -repo: 'deb http://ftp.debian.org/debian jessie-backports main' +repo: 'deb http://archive.debian.org/debian jessie-backports main' filename: 'backports' update_cache: yes when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' -- To view, visit https://gerrit.osmocom.org/13792 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: Idae47a6529f6a870e29ab688c3479b7ef4ba200a Gerrit-Change-Number: 13792 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-ci[master]: generalize the install-poky-sdk role to support multiple sdks
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13793 ) Change subject: generalize the install-poky-sdk role to support multiple sdks .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13793 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: I35f34a089311808cb21a064dd50e41cd1887b320 Gerrit-Change-Number: 13793 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Apr 2019 14:37:38 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: generalize the install-poky-sdk role to support multiple sdks
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/13793 )
Change subject: generalize the install-poky-sdk role to support multiple sdks
..
generalize the install-poky-sdk role to support multiple sdks
Change-Id: I35f34a089311808cb21a064dd50e41cd1887b320
---
M ansible/roles/install-poky-sdk/README.md
M ansible/roles/install-poky-sdk/defaults/main.yml
M ansible/roles/install-poky-sdk/tasks/main.yml
M ansible/setup-desktop.yml
M ansible/setup-jenkins-slave.yml
5 files changed, 32 insertions(+), 12 deletions(-)
Approvals:
Pau Espin Pedrol: Looks good to me, approved; Verified
diff --git a/ansible/roles/install-poky-sdk/README.md
b/ansible/roles/install-poky-sdk/README.md
index 541ea3c..7f2c31e 100644
--- a/ansible/roles/install-poky-sdk/README.md
+++ b/ansible/roles/install-poky-sdk/README.md
@@ -1,10 +1,17 @@
-# Install the poky sdk used to build sysmobts binaries
+# Install the poky sdk's used to build sysmobts binaries
# Poky Installation
The poky installation requires you to have the installer available.
Put the `poky_installer_file` to the root directory of this repo.
-Also the exact filename must match the variable `poky_installer_file` and the
-`poky_version`.
-For the defaults of those variable have a look into `defaults/main.yml`.
+Also the exact filename must match the variable `poky_installer_file`
+example:
+```
+- name: install-poky-sdk
+ jenkins_user: osmocom-build
+ poky_install_file:
poky-glibc-x86_64-meta-toolchain-osmo-cortexa15hf-neon-toolchain-osmo-2.3.4-20190426050512.sh
+ poky_dest: /opt/poky-sdk/2.3.4/
+ tags:
+- poky
+```
diff --git a/ansible/roles/install-poky-sdk/defaults/main.yml
b/ansible/roles/install-poky-sdk/defaults/main.yml
index 9b8eb04..5b7385c 100644
--- a/ansible/roles/install-poky-sdk/defaults/main.yml
+++ b/ansible/roles/install-poky-sdk/defaults/main.yml
@@ -1,7 +1,3 @@
---
# OS user
jenkins_user: jenkins
-
-poky_installer_file:
poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh
-poky_version: 2.3.4
-
diff --git a/ansible/roles/install-poky-sdk/tasks/main.yml
b/ansible/roles/install-poky-sdk/tasks/main.yml
index 9d64347..85b310a 100644
--- a/ansible/roles/install-poky-sdk/tasks/main.yml
+++ b/ansible/roles/install-poky-sdk/tasks/main.yml
@@ -1,5 +1,4 @@
---
-
- name: install bzip2 and tar
apt:
name: "{{ item }}"
@@ -19,21 +18,28 @@
tags: [poky]
- name: execute poky installer
- command: "/tmp/{{ poky_installer_file }} -y"
+ command: "/tmp/{{ poky_installer_file }} -y -d '{{ poky_dest }}'"
args:
-creates: "/opt/poky/{{ poky_version }}"
+creates: "{{ poky_dest }}"
when: poky_copy.failed == false
tags: [poky]
- name: change owner/group to jenkins user
file:
-path: /opt/poky
+path: "{{ poky_dest }}"
owner: "{{ jenkins_user }}"
group: "{{ jenkins_user }}"
recurse: yes
when: poky_copy.failed == false
tags: [poky]
+- name: remove poky installer
+ file:
+path: "/tmp/{{ poky_installer_file }}"
+state: absent
+ when: poky_copy.failed == false
+ tags: [poky]
+
- name: "Please download {{ poky_installer_file }} to your ansible directory
to allow ansible to install poky"
debug:
msg: "Ansible can not find or copy {{ poky_installer_file }}"
diff --git a/ansible/setup-desktop.yml b/ansible/setup-desktop.yml
index 507a8f2..563d124 100644
--- a/ansible/setup-desktop.yml
+++ b/ansible/setup-desktop.yml
@@ -9,6 +9,8 @@
- name: install-poky-sdk
jenkins_user: osmocom-build
+ poky_installer_file:
poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh
+ poky_dest: /opt/poky-sdk/2.3.4/
tags:
- poky
diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml
index 4ca7188..1135ab2 100644
--- a/ansible/setup-jenkins-slave.yml
+++ b/ansible/setup-jenkins-slave.yml
@@ -21,6 +21,15 @@
- name: install-poky-sdk
jenkins_user: osmocom-build
+ poky_install_file:
poky-glibc-x86_64-meta-toolchain-osmo-cortexa15hf-neon-toolchain-osmo-2.3.4-20190426050512.sh
+ poky_dest: /opt/poky-oc2g/2.3.4/
+ tags:
+- poky
+
+- name: install-poky-sdk
+ jenkins_user: osmocom-build
+ poky_installer_file:
poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh
+ poky_dest: /opt/poky-sdk/2.3.4/
tags:
- poky
--
To view, visit https://gerrit.osmocom.org/13793
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: I35f34a089311808cb21a064dd50e41cd1887b320
Gerrit-Change-Number: 13793
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-ci[master]: osmocom-jenkins-slave: fix jessie-backports as it got deprecated
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13792 ) Change subject: osmocom-jenkins-slave: fix jessie-backports as it got deprecated .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/13792 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: Idae47a6529f6a870e29ab688c3479b7ef4ba200a Gerrit-Change-Number: 13792 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Apr 2019 14:37:44 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: ansible: Document how to use ProxyJump to access ipv6 nodes
Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/13794 Change subject: ansible: Document how to use ProxyJump to access ipv6 nodes .. ansible: Document how to use ProxyJump to access ipv6 nodes Change-Id: I31b8f8ea5ed84a676c97ad2f6802be19f0e394d9 --- M ansible/README.md 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/94/13794/1 diff --git a/ansible/README.md b/ansible/README.md index 15c6164..f3185ec 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -18,3 +18,15 @@ `ansible-playbook -i hosts setup-jenkins-slave.yml` Further information on this job and around the setup can be found on the redmine wiki. + +If you don't have access to an IPv6 network from your local host, then you can +use an ssh proxy to updates hosts in the `hosts` files being accessed only +through an IPv6 addr. Your ssh proxy must of course have an IPv6 address able to +reach the destination host. + +example `.ssh/config`: +``` +Host 2a01:4f8:13b:828::1:* +ProxyJump proxyu...@myhostproxy.com:22 +User root +``` -- To view, visit https://gerrit.osmocom.org/13794 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: I31b8f8ea5ed84a676c97ad2f6802be19f0e394d9 Gerrit-Change-Number: 13794 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol
Change in osmo-ci[master]: osmocom-jenkins-slave: fix jessie-backports as it got deprecated
Pau Espin Pedrol has uploaded a new patch set (#2) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/13792 ) Change subject: osmocom-jenkins-slave: fix jessie-backports as it got deprecated .. osmocom-jenkins-slave: fix jessie-backports as it got deprecated Change-Id: Idae47a6529f6a870e29ab688c3479b7ef4ba200a --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/92/13792/2 -- To view, visit https://gerrit.osmocom.org/13792 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: Idae47a6529f6a870e29ab688c3479b7ef4ba200a Gerrit-Change-Number: 13792 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-ci[master]: generalize the install-poky-sdk role to support multiple sdks
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/13793
Change subject: generalize the install-poky-sdk role to support multiple sdks
..
generalize the install-poky-sdk role to support multiple sdks
Change-Id: I35f34a089311808cb21a064dd50e41cd1887b320
---
M ansible/roles/install-poky-sdk/README.md
M ansible/roles/install-poky-sdk/defaults/main.yml
M ansible/roles/install-poky-sdk/tasks/main.yml
M ansible/setup-desktop.yml
M ansible/setup-jenkins-slave.yml
5 files changed, 32 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/93/13793/1
diff --git a/ansible/roles/install-poky-sdk/README.md
b/ansible/roles/install-poky-sdk/README.md
index 541ea3c..7f2c31e 100644
--- a/ansible/roles/install-poky-sdk/README.md
+++ b/ansible/roles/install-poky-sdk/README.md
@@ -1,10 +1,17 @@
-# Install the poky sdk used to build sysmobts binaries
+# Install the poky sdk's used to build sysmobts binaries
# Poky Installation
The poky installation requires you to have the installer available.
Put the `poky_installer_file` to the root directory of this repo.
-Also the exact filename must match the variable `poky_installer_file` and the
-`poky_version`.
-For the defaults of those variable have a look into `defaults/main.yml`.
+Also the exact filename must match the variable `poky_installer_file`
+example:
+```
+- name: install-poky-sdk
+ jenkins_user: osmocom-build
+ poky_install_file:
poky-glibc-x86_64-meta-toolchain-osmo-cortexa15hf-neon-toolchain-osmo-2.3.4-20190426050512.sh
+ poky_dest: /opt/poky-sdk/2.3.4/
+ tags:
+- poky
+```
diff --git a/ansible/roles/install-poky-sdk/defaults/main.yml
b/ansible/roles/install-poky-sdk/defaults/main.yml
index 9b8eb04..5b7385c 100644
--- a/ansible/roles/install-poky-sdk/defaults/main.yml
+++ b/ansible/roles/install-poky-sdk/defaults/main.yml
@@ -1,7 +1,3 @@
---
# OS user
jenkins_user: jenkins
-
-poky_installer_file:
poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh
-poky_version: 2.3.4
-
diff --git a/ansible/roles/install-poky-sdk/tasks/main.yml
b/ansible/roles/install-poky-sdk/tasks/main.yml
index 9d64347..85b310a 100644
--- a/ansible/roles/install-poky-sdk/tasks/main.yml
+++ b/ansible/roles/install-poky-sdk/tasks/main.yml
@@ -1,5 +1,4 @@
---
-
- name: install bzip2 and tar
apt:
name: "{{ item }}"
@@ -19,21 +18,28 @@
tags: [poky]
- name: execute poky installer
- command: "/tmp/{{ poky_installer_file }} -y"
+ command: "/tmp/{{ poky_installer_file }} -y -d '{{ poky_dest }}'"
args:
-creates: "/opt/poky/{{ poky_version }}"
+creates: "{{ poky_dest }}"
when: poky_copy.failed == false
tags: [poky]
- name: change owner/group to jenkins user
file:
-path: /opt/poky
+path: "{{ poky_dest }}"
owner: "{{ jenkins_user }}"
group: "{{ jenkins_user }}"
recurse: yes
when: poky_copy.failed == false
tags: [poky]
+- name: remove poky installer
+ file:
+path: "/tmp/{{ poky_installer_file }}"
+state: absent
+ when: poky_copy.failed == false
+ tags: [poky]
+
- name: "Please download {{ poky_installer_file }} to your ansible directory
to allow ansible to install poky"
debug:
msg: "Ansible can not find or copy {{ poky_installer_file }}"
diff --git a/ansible/setup-desktop.yml b/ansible/setup-desktop.yml
index 507a8f2..563d124 100644
--- a/ansible/setup-desktop.yml
+++ b/ansible/setup-desktop.yml
@@ -9,6 +9,8 @@
- name: install-poky-sdk
jenkins_user: osmocom-build
+ poky_installer_file:
poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh
+ poky_dest: /opt/poky-sdk/2.3.4/
tags:
- poky
diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml
index 4ca7188..1135ab2 100644
--- a/ansible/setup-jenkins-slave.yml
+++ b/ansible/setup-jenkins-slave.yml
@@ -21,6 +21,15 @@
- name: install-poky-sdk
jenkins_user: osmocom-build
+ poky_install_file:
poky-glibc-x86_64-meta-toolchain-osmo-cortexa15hf-neon-toolchain-osmo-2.3.4-20190426050512.sh
+ poky_dest: /opt/poky-oc2g/2.3.4/
+ tags:
+- poky
+
+- name: install-poky-sdk
+ jenkins_user: osmocom-build
+ poky_installer_file:
poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh
+ poky_dest: /opt/poky-sdk/2.3.4/
tags:
- poky
--
To view, visit https://gerrit.osmocom.org/13793
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: I35f34a089311808cb21a064dd50e41cd1887b320
Gerrit-Change-Number: 13793
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Change in osmo-ci[master]: osmocom-jenkins-slave: fix jessie-backports as it got deprecated
lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/13792 Change subject: osmocom-jenkins-slave: fix jessie-backports as it got deprecated .. osmocom-jenkins-slave: fix jessie-backports as it got deprecated Change-Id: Idae47a6529f6a870e29ab688c3479b7ef4ba200a --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/92/13792/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 641c6f3..0f0f651 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -17,9 +17,15 @@ - fakeroot when: install_jenkins_utilities +- name: stop checking release validity for old statble + copy: +content: 'Acquire::Check-Valid-Until "false";' +dest: '/etc/apt/apt.conf.d/90-stop-check-release-validity' + when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' + - name: enable backports for jessie apt_repository: -repo: 'deb http://ftp.debian.org/debian jessie-backports main' +repo: 'deb http://archive.debian.org/debian jessie-backports main' filename: 'backports' update_cache: yes when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' -- To view, visit https://gerrit.osmocom.org/13792 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: Idae47a6529f6a870e29ab688c3479b7ef4ba200a Gerrit-Change-Number: 13792 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus
Change in osmo-ttcn3-hacks[master]: BTS_Tests: use 0.0 as default for mp_ipa_up_delay
dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/13791 ) Change subject: BTS_Tests: use 0.0 as default for mp_ipa_up_delay .. BTS_Tests: use 0.0 as default for mp_ipa_up_delay The module parameter mp_ipa_up_delay ads a delay after the ipa bring up. This is relevant for the tests with real BTS hardware, but it is not relavent for the regular TTCN3 tests. Lets set the default to 0.0, since the delay caused problems with TC_rsl_ms_pwr_ctrl and TC_si_sched_13_2bis_2ter_2quater. Change-Id: I7663cad5df1ee5a8bcdbbf522881999f1be9f4fe Related: OS#3960 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 35f51a1..e1c64d6 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -65,7 +65,7 @@ integer mp_timing_offset_256syms_exp := 512; /* Time to wait for RSL conn from BTS during startup of test */ float mp_ipa_up_timeout := 15.0; - float mp_ipa_up_delay := 3.0; + float mp_ipa_up_delay := 0.0; } type record of RslChannelNr ChannelNrs; -- To view, visit https://gerrit.osmocom.org/13791 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: I7663cad5df1ee5a8bcdbbf522881999f1be9f4fe Gerrit-Change-Number: 13791 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter
Change in osmo-ttcn3-hacks[master]: BTS_Tests: use 0.0 as default for mp_ipa_up_delay
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13791 ) Change subject: BTS_Tests: use 0.0 as default for mp_ipa_up_delay .. Patch Set 1: You are going to have issues with real HW tests then anyway because you'll set this variable to higher values right? maybe it's better fixing that wirth virtual setup and the value != 0.0. -- To view, visit https://gerrit.osmocom.org/13791 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: I7663cad5df1ee5a8bcdbbf522881999f1be9f4fe Gerrit-Change-Number: 13791 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Apr 2019 12:25:56 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: BTS_Tests: use 0.0 as default for mp_ipa_up_delay
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13791 ) Change subject: BTS_Tests: use 0.0 as default for mp_ipa_up_delay .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13791 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: I7663cad5df1ee5a8bcdbbf522881999f1be9f4fe Gerrit-Change-Number: 13791 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Apr 2019 12:25:05 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ggsn[master]: ggsn: More logging from PCO handling (e.g. in case of malconfiguration)
Max has posted comments on this change. ( https://gerrit.osmocom.org/13609 ) Change subject: ggsn: More logging from PCO handling (e.g. in case of malconfiguration) .. Patch Set 4: Some comment/reference to what PCO is would be helpful. P. S> Seems like I'm unable to +1 this due to some permissions problem. -- To view, visit https://gerrit.osmocom.org/13609 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: I38c2c4178ff4fd795f54638adec63166b1c0838e Gerrit-Change-Number: 13609 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 11:26:23 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-ggsn[master]: ggsn: Add minimalistic PAP support
Max has posted comments on this change. ( https://gerrit.osmocom.org/13608 ) Change subject: ggsn: Add minimalistic PAP support .. Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/13608/4/ggsn/ggsn.c File ggsn/ggsn.c: https://gerrit.osmocom.org/#/c/13608/4/ggsn/ggsn.c@511 PS4, Line 511: static const char *pap_welcome = "Welcome to OsmoGGSN"; Maybe add version to make it even more informative? -- To view, visit https://gerrit.osmocom.org/13608 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: I81875f30f9f1497199253497f84718510747f731 Gerrit-Change-Number: 13608 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 11:23:54 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-msc[master]: libmsc/db.c: fix storing SMS with empty TP-User-Data
Max has posted comments on this change. ( https://gerrit.osmocom.org/13630 ) Change subject: libmsc/db.c: fix storing SMS with empty TP-User-Data .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/13630/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/13630/1//COMMIT_MSG@7 PS1, Line 7: libmsc/db.c: fix storing SMS with empty TP-User-Data Is this even legitimate case? Are there such SMS messages or we should error out instead of adding the safeguard? -- To view, visit https://gerrit.osmocom.org/13630 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: If0b2bb557118c5f0e520a2e6c2816336f6028661 Gerrit-Change-Number: 13630 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 11:21:23 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-msc[master]: Introduce initial unit test for db_sms_* API
Max has posted comments on this change. ( https://gerrit.osmocom.org/13629 ) Change subject: Introduce initial unit test for db_sms_* API .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/13629/1/src/libmsc/db.c File src/libmsc/db.c: https://gerrit.osmocom.org/#/c/13629/1/src/libmsc/db.c@773 PS1, Line 773: if (net != NULL) /* db_sms_test passes NULL, so we need to be tolerant */ This can be split-off into separate patch. -- To view, visit https://gerrit.osmocom.org/13629 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: Id94ad35b6f78f839137db2e17010fbf9b40111a3 Gerrit-Change-Number: 13629 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 11:10:02 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-msc[master]: libmsc/gsm_04_11.c: properly handle TP-User-Data-Length
Max has posted comments on this change. ( https://gerrit.osmocom.org/13655 ) Change subject: libmsc/gsm_04_11.c: properly handle TP-User-Data-Length .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/13655/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/13655/1//COMMIT_MSG@25 PS1, Line 25: Preventing this would require adding an additional check. Is there a ticket for that? If so please reference it in here otherwise create it and than reference :) https://gerrit.osmocom.org/#/c/13655/1/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/13655/1/src/libmsc/gsm_04_11.c@574 PS1, Line 574:"TP-User-Data-Length %u (septets) " What's the point of splitting the strings this way? We're well within the length limit. -- To view, visit https://gerrit.osmocom.org/13655 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: I4b08db7665e854a045129e7695e2bdf296df1688 Gerrit-Change-Number: 13655 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 11:06:01 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in libosmocore[master]: make all library-internal static buffers thread-local
Max has posted comments on this change. ( https://gerrit.osmocom.org/13436 ) Change subject: make all library-internal static buffers thread-local .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/13436/6//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/13436/6//COMMIT_MSG@15 PS6, Line 15: execute the same functiosn once. They're of course still not typo: functions -- To view, visit https://gerrit.osmocom.org/13436 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: I50eb2436a7c1261d79a9d2955584dce92780ca07 Gerrit-Change-Number: 13436 Gerrit-PatchSet: 6 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 11:00:50 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-bts[master]: osmo-bts-trx: distinguish 11-bit Access Bursts by synch. sequence
Max has posted comments on this change. ( https://gerrit.osmocom.org/13723 ) Change subject: osmo-bts-trx: distinguish 11-bit Access Bursts by synch. sequence .. Patch Set 4: (2 comments) https://gerrit.osmocom.org/#/c/13723/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/13723/4//COMMIT_MSG@24 PS4, Line 24: According to 3GPP TS 05.02, section 5.2.7, there are two alternative It's better to refer to latest version of the spec. https://gerrit.osmocom.org/#/c/13723/4//COMMIT_MSG@29 PS4, Line 29: According to 3GPP TS 04.60, section 11.2.5a, the EGPRS capability Here as well. -- To view, visit https://gerrit.osmocom.org/13723 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: Ibb6d27c6589965c8b59a6d2598a7c43fd860f284 Gerrit-Change-Number: 13723 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 10:52:56 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-trx[master]: lms: flush_recv: alloc buf on stack instead of heap
Max has posted comments on this change. ( https://gerrit.osmocom.org/13782 ) Change subject: lms: flush_recv: alloc buf on stack instead of heap .. Patch Set 1: > Using the stack is quicker. What makes you think that? Do you have benchmark? I wouldn't be surprised if modern compiler optimize such a trivial case. -- To view, visit https://gerrit.osmocom.org/13782 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: Iede8dc0903ee3865a52c8e2fd811bcde444fee33 Gerrit-Change-Number: 13782 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 10:49:50 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-trx[master]: lms: Remove references to ALERT loglevel
Max has posted comments on this change. ( https://gerrit.osmocom.org/13787 ) Change subject: lms: Remove references to ALERT loglevel .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13787 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: I0e171a8ac8a8bfa804ac97fba3d73efcfa6424b4 Gerrit-Change-Number: 13787 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 10:47:36 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-trx[master]: lms: Remove unused var m_last_tx_overruns
Max has posted comments on this change. ( https://gerrit.osmocom.org/13788 ) Change subject: lms: Remove unused var m_last_tx_overruns .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13788 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: I2104205b2af7cd6c86075d5cc4f0f36bde5e5311 Gerrit-Change-Number: 13788 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 10:46:39 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-trx[master]: cosmetic: Threads.h: Remove trailing whitespace
Max has posted comments on this change. ( https://gerrit.osmocom.org/13784 ) Change subject: cosmetic: Threads.h: Remove trailing whitespace .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13784 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: I0ae6e435a7f0480c3eaa08dccfe824456f33b015 Gerrit-Change-Number: 13784 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 26 Apr 2019 10:45:55 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: BTS_Tests: use 0.0 as default for mp_ipa_up_delay
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/13791 Change subject: BTS_Tests: use 0.0 as default for mp_ipa_up_delay .. BTS_Tests: use 0.0 as default for mp_ipa_up_delay The module parameter mp_ipa_up_delay ads a delay after the ipa bring up. This is relevant for the tests with real BTS hardware, but it is not relavent for the regular TTCN3 tests. Lets set the default to 0.0, since the delay caused problems with TC_rsl_ms_pwr_ctrl and TC_si_sched_13_2bis_2ter_2quater. Change-Id: I7663cad5df1ee5a8bcdbbf522881999f1be9f4fe Related: OS#3960 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/13791/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 35f51a1..e1c64d6 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -65,7 +65,7 @@ integer mp_timing_offset_256syms_exp := 512; /* Time to wait for RSL conn from BTS during startup of test */ float mp_ipa_up_timeout := 15.0; - float mp_ipa_up_delay := 3.0; + float mp_ipa_up_delay := 0.0; } type record of RslChannelNr ChannelNrs; -- To view, visit https://gerrit.osmocom.org/13791 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: I7663cad5df1ee5a8bcdbbf522881999f1be9f4fe Gerrit-Change-Number: 13791 Gerrit-PatchSet: 1 Gerrit-Owner: dexter
Change in osmo-sgsn[master]: gprs_gmm: send Service Reject when no PDP ctxs are available.
Mykola Shchetinin has posted comments on this change. (
https://gerrit.osmocom.org/13744 )
Change subject: gprs_gmm: send Service Reject when no PDP ctxs are available.
..
Patch Set 7:
(1 comment)
https://gerrit.osmocom.org/#/c/13744/6/src/gprs/gprs_gmm.c
File src/gprs/gprs_gmm.c:
https://gerrit.osmocom.org/#/c/13744/6/src/gprs/gprs_gmm.c@1935
PS6, Line 1935: if (ms_has_active_pdp_and_sgsn_has_none(ctx,
pdp_status, pdp_status_len)) {
> At the moment you check if the MS & SGSN is out of sync. […]
Done
--
To view, visit https://gerrit.osmocom.org/13744
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: If610cbef17c25ec44e65d4f1b2340d102c560437
Gerrit-Change-Number: 13744
Gerrit-PatchSet: 7
Gerrit-Owner: Mykola Shchetinin
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Mykola Shchetinin
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: lynxis lazus
Gerrit-Comment-Date: Fri, 26 Apr 2019 10:17:27 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in osmo-sgsn[master]: gprs_gmm: send Service Reject when no PDP ctxs are available.
Hello lynxis lazus, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13744 to look at the new patch set (#7). Change subject: gprs_gmm: send Service Reject when no PDP ctxs are available. .. gprs_gmm: send Service Reject when no PDP ctxs are available. Look at PDP Context Status IE: if there are any PDP contexts which are ACTIVE on MS side and there are no PDP contexts which are ACTIVE on the network side, then send Service Reject with the cause "NO PDP ACTIVATED". This forces MS to reactivate the PDP contexts. 3GPP TS 24.008 Section 4.7.13.4 Service request procedure not accepted by the network. Cause # 40. Fixes: OS#3937 Change-Id: If610cbef17c25ec44e65d4f1b2340d102c560437 --- M src/gprs/gprs_gmm.c M tests/sgsn/sgsn_test.c M tests/sgsn/sgsn_test.ok 3 files changed, 101 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/44/13744/7 -- To view, visit https://gerrit.osmocom.org/13744 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: If610cbef17c25ec44e65d4f1b2340d102c560437 Gerrit-Change-Number: 13744 Gerrit-PatchSet: 7 Gerrit-Owner: Mykola Shchetinin Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Mykola Shchetinin Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus
Change in docker-playground[master]: Add script to bisect test failures with ttcn3 and docker
Daniel Willmann has posted comments on this change. ( https://gerrit.osmocom.org/13790 ) Change subject: Add script to bisect test failures with ttcn3 and docker .. Patch Set 1: Verified+1 Worked in my tests. Not used in jenkins so won't break any automatic jobs. -- To view, visit https://gerrit.osmocom.org/13790 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: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f Gerrit-Change-Number: 13790 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Apr 2019 10:09:18 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in docker-playground[master]: Add script to bisect test failures with ttcn3 and docker
Daniel Willmann has uploaded this change for review. (
https://gerrit.osmocom.org/13790
Change subject: Add script to bisect test failures with ttcn3 and docker
..
Add script to bisect test failures with ttcn3 and docker
With this script you can now use docker ttcn3 test results to bisect a
regression and find the offending commit.
Use like this from the osmo-* git repository:
$ git bisect start
$ git bisect run ~/scm/osmo/docker-playground/osmo-bisect.sh
e.g.:
$ git bisect run ~/scm/osmo/docker-playground/osmo-bisect.sh bsc
BSC_Tests.TC_ho_in_fail_no_detect
Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f
---
A osmo-bisect.sh
1 file changed, 53 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/90/13790/1
diff --git a/osmo-bisect.sh b/osmo-bisect.sh
new file mode 100755
index 000..5ca69cd
--- /dev/null
+++ b/osmo-bisect.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Script to bisect an osmo-* project with the docker ttcn3 images
+# You need the git checkout of the project you wand to test as well as a
+# checkout of the docker-playground repository.
+
+# Use like this from the osmo-* project repository where the regression
+# occurs:
+# $ git bisect start
+# $ git bisect run ~/scm/osmo/docker-playground/osmo-bisect.sh
+# e.g.:
+# $ git bisect run ~/scm/osmo/docker-playground/osmo-bisect.sh bsc
BSC_Tests.TC_ho_in_fail_no_detect
+
+
+DOCKER_PLAYGROUND=$(dirname "$0")
+COMP_UPPER=$(echo "$1" | tr '[:lower:]' '[:upper:]')
+COMP_LOWER=$(echo "$1" | tr '[:upper:]' '[:lower:]')
+TESTCASE=$2
+
+COMMIT=$(git log -1 --format=format:%H)
+
+case $COMP_LOWER in
+ "hnbgw")
+ BRANCH="OSMO_IUH_BRANCH"
+ SUITE="ttcn3-hnbgw-test"
+ ;;
+ "bsc"|\
+ "bts"|\
+ "ggsn"|\
+ "hlr"|\
+ "mgw"|\
+ "msc"|\
+ "nitb"|\
+ "pcu"|\
+ "sgsn"|\
+ "sip"|\
+ "stp")
+ BRANCH="OSMO_${COMP_UPPER}_BRANCH"
+ SUITE="ttcn3-${COMP_LOWER}-test"
+ ;;
+ *)
+ echo "Unknown repo, please fix the script!"
+ exit 125
+ ;;
+esac
+
+export "$BRANCH=$COMMIT"
+
+cd "$DOCKER_PLAYGROUND/$SUITE" || exit 125
+
+echo "Testing for $COMMIT"
+./jenkins.sh | grep -- "== $TESTCASE pass =="
+exit $?
--
To view, visit https://gerrit.osmocom.org/13790
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: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f
Gerrit-Change-Number: 13790
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Willmann
Change in docker-playground[master]: Add OSMO_*_BRANCH environment variables for build args
Daniel Willmann has submitted this change and it was merged. ( https://gerrit.osmocom.org/13779 ) Change subject: Add OSMO_*_BRANCH environment variables for build args .. Add OSMO_*_BRANCH environment variables for build args Previously we could only set OSMO_TTCN3_BRANCH as environment variable to build a test other than master. This patch adds environment variables for all osmo-*-master images which allow docker tests to be executed for an arbitrary commit. The origin/ prefix from the git checkout command is removed so the *_BRANCH variable doesn't have to contain branch names, but van also contain arbitrary commits. This shouldn't have any adverse effect as we only have one remote in the checkout. Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869 --- M make/Makefile M osmo-bsc-master/Dockerfile M osmo-bts-master/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-pcu-master/Dockerfile M osmo-sgsn-master/Dockerfile M osmo-sip-master/Dockerfile M osmo-stp-master/Dockerfile 13 files changed, 40 insertions(+), 13 deletions(-) Approvals: Daniel Willmann: Verified Harald Welte: Looks good to me, approved diff --git a/make/Makefile b/make/Makefile index 7dfa795..000db25 100644 --- a/make/Makefile +++ b/make/Makefile @@ -17,6 +17,18 @@ USERNAME?=$(USER) NAME?=$(shell basename $(CURDIR)) OSMO_TTCN3_BRANCH?=master +OSMO_BSC_BRANCH?=master +OSMO_BTS_BRANCH?=master +OSMO_GGSN_BRANCH?=master +OSMO_HLR_BRANCH?=master +OSMO_IUH_BRANCH?=master +OSMO_MGW_BRANCH?=master +OSMO_MSC_BRANCH?=master +OSMO_NITB_BRANCH?=master +OSMO_PCU_BRANCH?=master +OSMO_SGSN_BRANCH?=master +OSMO_SIP_BRANCH?=master +OSMO_STP_BRANCH?=master PULL?= RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST/.make-release-support @@ -42,6 +54,18 @@ docker-build: .release docker build --build-arg USER=$(USERNAME) --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \ + --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \ + --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \ + --build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \ + --build-arg OSMO_HLR_BRANCH=$(OSMO_HLR_BRANCH) \ + --build-arg OSMO_IUH_BRANCH=$(OSMO_IUH_BRANCH) \ + --build-arg OSMO_MGW_BRANCH=$(OSMO_MGW_BRANCH) \ + --build-arg OSMO_MSC_BRANCH=$(OSMO_MSC_BRANCH) \ + --build-arg OSMO_NITB_BRANCH=$(OSMO_NITB_BRANCH) \ + --build-arg OSMO_PCU_BRANCH=$(OSMO_PCU_BRANCH) \ + --build-arg OSMO_SGSN_BRANCH=$(OSMO_SGSN_BRANCH) \ + --build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \ + --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \ $(PULL) -t $(IMAGE):latest . @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \ DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \ diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 61ac8e4..bcd0573 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -32,7 +32,7 @@ ADDhttp://git.osmocom.org/osmo-bsc/patch?h=$OSMO_BSC_BRANCH /tmp/commit-osmo-bsc RUNcd osmo-bsc && \ - git fetch && git checkout -f -B $OSMO_BSC_BRANCH origin/$OSMO_BSC_BRANCH && \ + git fetch && git checkout -f -B $OSMO_BSC_BRANCH $OSMO_BSC_BRANCH && \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index be58081..f4ddf3a 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -33,7 +33,7 @@ ADDhttp://git.osmocom.org/osmo-bts/patch?h=$OSMO_BTS_BRANCH /tmp/commit-osmo-bts RUNcd osmo-bts && \ - git fetch && git checkout -f -B $OSMO_BTS_BRANCH origin/$OSMO_BTS_BRANCH && \ + git fetch && git checkout -f -B $OSMO_BTS_BRANCH $OSMO_BTS_BRANCH && \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-trx && \ diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index ca4f111..cf84d02 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -25,7 +25,7 @@ RUNgit clone git://git.osmocom.org/osmo-ggsn.git ADDhttp://git.osmocom.org/osmo-ggsn/patch/?h=$OSMO_GGSN_BRANCH /tmp/commit RUNcd osmo-ggsn && \ - git fetch && git checkout -f -B $OSMO_GGSN_BRANCH origin/$OSMO_GGSN_BRANCH && \ + git fetch && git checkout -f -B $OSMO_GGSN_BRANCH $OSMO_GGSN_BRANCH && \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ diff --git a/osmo-hlr-master/Doc
