Change in osmo-msc[master]: a_iface_bssap: check bssamp length field
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13307 ) Change subject: a_iface_bssap: check bssamp length field .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/13307/1/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/13307/1/src/libmsc/a_iface_bssap.c@722 PS1, Line 722: "BSSMAP message contains extranous data, expected %u bytes, got %u bytes, truncated\n", Same as other patch: "extraneous". Better use "extra". -- To view, visit https://gerrit.osmocom.org/13307 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: I3b89dd5a66ec83b03860b58b6b8eb58007f433a4 Gerrit-Change-Number: 13307 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 18 Mar 2019 17:19:02 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: osmo_bsc_bssap: check bssamp length field
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13306 ) Change subject: osmo_bsc_bssap: check bssamp length field .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/13306/1/src/osmo-bsc/osmo_bsc_bssap.c File src/osmo-bsc/osmo_bsc_bssap.c: https://gerrit.osmocom.org/#/c/13306/1/src/osmo-bsc/osmo_bsc_bssap.c@1100 PS1, Line 1100: "BSSMAP message contains extranous data, expected %u bytes, got %u bytes, truncated\n", typo: extraneous? Would be clear saying "extra data". -- To view, visit https://gerrit.osmocom.org/13306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idef2e783d2377a2ad1f697ea4d26491a32b3e549 Gerrit-Change-Number: 13306 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 18 Mar 2019 17:17:23 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-msc[master]: a_iface_bssap: check bssamp length field
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/13307
Change subject: a_iface_bssap: check bssamp length field
..
a_iface_bssap: check bssamp length field
At the moment the length field of the bssmap header is not parsed.
Instead the length is computed out of the known header length and the
number of bytes received. This is prone to error, lets make sure that
extranous data at the end of a message is ignored by parsing the bssmap
length correctly.
Change-Id: I3b89dd5a66ec83b03860b58b6b8eb58007f433a4
Related: OS#3806
---
M src/libmsc/a_iface_bssap.c
1 file changed, 28 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/07/13307/1
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c
index cb245b8..d0594bf 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -703,6 +703,33 @@
return 0;
}
+/* Extract and verify the length information from the BSSMAP header. */
+void bssmap_msg_verify_len(struct msgb *msg)
+{
+ unsigned int expected_len;
+ unsigned int calculated_len;
+ struct bssmap_header *bssmap_header;
+
+ bssmap_header = (struct bssmap_header *)msg->l2h;
+
+ calculated_len = msgb_l3len(msg);
+ expected_len = bssmap_header->length;
+
+ /* In case of contradictory length information, decide for the
+* shorter length */
+ if (calculated_len > expected_len) {
+ LOGP(DBSSAP, LOGL_NOTICE,
+"BSSMAP message contains extranous data, expected %u
bytes, got %u bytes, truncated\n",
+expected_len, calculated_len);
+ msgb_l3trim(msg, expected_len);
+ } else if (calculated_len < expected_len) {
+ LOGP(DMSC, LOGL_NOTICE,
+"Short BSSMAP message, expected %u bytes, got %u bytes\n",
+expected_len, calculated_len);
+ msgb_l3trim(msg, calculated_len);
+ }
+}
+
/* Handle incoming connection oriented messages. No ownership of 'msg' is
passed on! */
int a_sccp_rx_dt(struct osmo_sccp_user *scu, const struct a_conn_info
*a_conn_info, struct msgb *msg)
{
@@ -718,6 +745,7 @@
switch (msg->l2h[0]) {
case BSSAP_MSG_BSS_MANAGEMENT:
msg->l3h = >l2h[sizeof(struct bssmap_header)];
+ bssmap_msg_verify_len(msg);
return rx_bssmap(scu, a_conn_info, msg);
case BSSAP_MSG_DTAP:
return rx_dtap(scu, a_conn_info, msg);
--
To view, visit https://gerrit.osmocom.org/13307
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b89dd5a66ec83b03860b58b6b8eb58007f433a4
Gerrit-Change-Number: 13307
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Change in osmo-bsc[master]: osmo_bsc_bssap: check bssamp length field
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/13306
Change subject: osmo_bsc_bssap: check bssamp length field
..
osmo_bsc_bssap: check bssamp length field
At the moment the length field of the bssmap header is not parsed.
Instead the length is computed out of the known header length and the
number of bytes received. This is prone to error, lets make sure that
extranous data at the end of a message is ignored by parsing the bssmap
length correctly.
Change-Id: Idef2e783d2377a2ad1f697ea4d26491a32b3e549
Related: OS#3806
---
M src/osmo-bsc/osmo_bsc_bssap.c
1 file changed, 30 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/13306/1
diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c
index 85aab22..4c7bcb3 100644
--- a/src/osmo-bsc/osmo_bsc_bssap.c
+++ b/src/osmo-bsc/osmo_bsc_bssap.c
@@ -1081,6 +1081,35 @@
return 0;
}
+/* Extract and verify the length information from the BSSMAP header. */
+static unsigned int bssmap_msg_len(struct msgb *msg, unsigned int length)
+{
+ unsigned int expected_len;
+ unsigned int calculated_len;
+ struct bssmap_header *bssmap_header;
+
+ bssmap_header = (struct bssmap_header *)msg->l3h;
+
+ calculated_len = length - sizeof(struct bssmap_header);
+ expected_len = bssmap_header->length;
+
+ /* In case of contradictory length information, decide for the
+* shorter length */
+ if (calculated_len > expected_len) {
+ LOGP(DMSC, LOGL_NOTICE,
+"BSSMAP message contains extranous data, expected %u
bytes, got %u bytes, truncated\n",
+expected_len, calculated_len);
+ return expected_len;
+ } else if (calculated_len < expected_len) {
+ LOGP(DMSC, LOGL_NOTICE,
+"Short BSSMAP message, expected %u bytes, got %u bytes\n",
+expected_len, calculated_len);
+ return calculated_len;
+ }
+
+ return expected_len;
+}
+
int bsc_handle_dt(struct gsm_subscriber_connection *conn,
struct msgb *msg, unsigned int len)
{
@@ -1093,7 +1122,7 @@
switch (msg->l3h[0]) {
case BSSAP_MSG_BSS_MANAGEMENT:
msg->l4h = >l3h[sizeof(struct bssmap_header)];
- bssmap_rcvmsg_dt1(conn, msg, len - sizeof(struct
bssmap_header));
+ bssmap_rcvmsg_dt1(conn, msg, bssmap_msg_len(msg, len));
break;
case BSSAP_MSG_DTAP:
dtap_rcvmsg(conn, msg, len);
--
To view, visit https://gerrit.osmocom.org/13306
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idef2e783d2377a2ad1f697ea4d26491a32b3e549
Gerrit-Change-Number: 13306
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Change in osmo-sysmon[master]: Add vty option to print output of shell cmd on every poll step
Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13304 to look at the new patch set (#2). Change subject: Add vty option to print output of shell cmd on every poll step .. Add vty option to print output of shell cmd on every poll step Change-Id: I005773b75f81fa5f6c90f53af508fc6debea208b --- M doc/examples/osmo-sysmon.cfg M src/Makefile.am M src/osysmon.h A src/osysmon_cmd.c M src/osysmon_main.c 5 files changed, 181 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/04/13304/2 -- To view, visit https://gerrit.osmocom.org/13304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I005773b75f81fa5f6c90f53af508fc6debea208b Gerrit-Change-Number: 13304 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max
Change in osmo-bts[master]: Constify pcu_rx_*() parameters
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/13298 )
Change subject: Constify pcu_rx_*() parameters
..
Constify pcu_rx_*() parameters
Use const for data parameter where appropriate.
Change-Id: Ia228c001ca07cfde61b540bec6257b62aec93517
---
M include/osmo-bts/l1sap.h
M src/common/l1sap.c
M src/common/pcu_sock.c
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
dexter: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h
index 3cf0ea5..70b4564 100644
--- a/include/osmo-bts/l1sap.h
+++ b/include/osmo-bts/l1sap.h
@@ -71,7 +71,7 @@
/* pcu (socket interface) sends us a data request primitive */
int l1sap_pdch_req(struct gsm_bts_trx_ts *ts, int is_ptcch, uint32_t fn,
- uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len);
+ uint16_t arfcn, uint8_t block_nr, const uint8_t *data, uint8_t len);
/* call-back function for incoming RTP */
void l1sap_rtp_rx_cb(struct osmo_rtp_socket *rs, const uint8_t *rtp_pl,
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index dba08df..a1b0464 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1388,7 +1388,7 @@
/* pcu (socket interface) sends us a data request primitive */
int l1sap_pdch_req(struct gsm_bts_trx_ts *ts, int is_ptcch, uint32_t fn,
- uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len)
+ uint16_t arfcn, uint8_t block_nr, const uint8_t *data, uint8_t len)
{
struct msgb *msg;
struct osmo_phsap_prim *l1sap;
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 60e0f7a..2c7028e 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -466,7 +466,7 @@
}
static int pcu_rx_data_req(struct gsm_bts *bts, uint8_t msg_type,
- struct gsm_pcu_if_data *data_req)
+ const struct gsm_pcu_if_data *data_req)
{
uint8_t is_ptcch;
struct gsm_bts_trx *trx;
@@ -538,7 +538,7 @@
}
static int pcu_rx_pag_req(struct gsm_bts *bts, uint8_t msg_type,
- struct gsm_pcu_if_pag_req *pag_req)
+ const struct gsm_pcu_if_pag_req *pag_req)
{
int rc = 0;
@@ -598,7 +598,7 @@
}
static int pcu_rx_act_req(struct gsm_bts *bts,
- struct gsm_pcu_if_act_req *act_req)
+ const struct gsm_pcu_if_act_req *act_req)
{
struct gsm_bts_trx *trx;
struct gsm_lchan *lchan;
--
To view, visit https://gerrit.osmocom.org/13298
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia228c001ca07cfde61b540bec6257b62aec93517
Gerrit-Change-Number: 13298
Gerrit-PatchSet: 2
Gerrit-Owner: Max
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: dexter
Gerrit-Reviewer: osmith
Change in osmo-bts[master]: Constify pcu_rx_*() parameters
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13298 ) Change subject: Constify pcu_rx_*() parameters .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13298 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: Ia228c001ca07cfde61b540bec6257b62aec93517 Gerrit-Change-Number: 13298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 18 Mar 2019 16:28:31 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: BTS: use PCU-related test cases as version string
Max has uploaded this change for review. ( https://gerrit.osmocom.org/13305
Change subject: BTS: use PCU-related test cases as version string
..
BTS: use PCU-related test cases as version string
When running PCU-related tests against BTS use name of the test as a PCU
version string sent from TTCN-3 code. This makes it easier to separate
OsmoBTS log output related to different test cases.
Change-Id: I9ef9e46061ef116529bdea196050f914804615b3
---
M bts/BTS_Tests.ttcn
1 file changed, 34 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/05/13305/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 86d43fe..5c43453 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -2726,30 +2726,40 @@
/* PDCH activation via PCU socket; check for presence of RTS.req */
testcase TC_pcu_act_req() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"act_req")));
+
f_TC_pcu_act_req(0, 0, 7, true);
}
/* PDCH activation via PCU socket on non-PDCU timeslot */
testcase TC_pcu_act_req_wrong_ts() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"act_req_wrong_ts")));
+
f_TC_pcu_act_req(0, 0, 1, false);
}
/* PDCH activation via PCU socket on wrong BTS */
testcase TC_pcu_act_req_wrong_bts() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"act_req_wrong_bts")));
+
f_TC_pcu_act_req(23, 0, 7, false);
}
/* PDCH activation via PCU socket on wrong TRX */
testcase TC_pcu_act_req_wrong_trx() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"act_req_wrong_trx")));
+
f_TC_pcu_act_req(0, 23, 7, false);
}
/* PDCH deactivation via PCU socket; check for absence of RTS.req */
testcase TC_pcu_deact_req() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"deact_req")));
+
/* Activate PDCH */
f_TC_pcu_act_req(0, 0, 7, true);
f_sleep(1.0);
@@ -2760,6 +2770,8 @@
/* Attempt to deactivate a PDCH on a non-PDCH timeslot */
testcase TC_pcu_deact_req_wrong_ts() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"deact_req_wrong_ts")));
+
f_TC_pcu_deact_req(0, 0, 1);
}
@@ -2769,10 +2781,11 @@
var PCUIF_send_data sd;
timer T:= 3.0;
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"ver_si13")));
/* Set SI13 via RSL */
f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_13, si13);
- PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"BTS_Test v23")));
+
T.start;
alt {
[] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_DATA_IND(0, 0, 0, ?,
PCU_IF_SAPI_BCCH))) -> value sd {
@@ -2825,6 +2838,8 @@
/* Send DATA.req on invalid BTS */
testcase TC_pcu_data_req_wrong_bts() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"data_req_wrong_bts")));
+
f_TC_pcu_act_req(0, 0, 7, true);
f_pcu_data_req(23, 0, 7, 0, 0, PCU_IF_SAPI_PDTCH, c_PCU_DATA);
/* FIXME: how to check this wasn't actually sent and didn't crash BTS?
*/
@@ -2834,6 +2849,8 @@
/* Send DATA.req on invalid TRX */
testcase TC_pcu_data_req_wrong_trx() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"data_req_wrong_trx")));
+
f_TC_pcu_act_req(0, 0, 7, true);
f_pcu_data_req(0, 100, 7, 0, 0, PCU_IF_SAPI_PDTCH, c_PCU_DATA);
/* FIXME: how to check this wasn't actually sent and didn't crash BTS?
*/
@@ -2843,6 +2860,8 @@
/* Send DATA.req on invalid timeslot */
testcase TC_pcu_data_req_wrong_ts() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"data_req_wrong_ts")));
+
f_TC_pcu_act_req(0, 0, 7, true);
f_pcu_data_req(0, 0, 70, 0, 0, PCU_IF_SAPI_PDTCH, c_PCU_DATA);
/* FIXME: how to check this wasn't actually sent and didn't crash BTS?
*/
@@ -2852,6 +2871,8 @@
/* Send DATA.req on timeslot that hasn't been activated */
testcase TC_pcu_data_req_ts_inactive() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"data_req_ts_inactive")));
+
f_pcu_data_req(0, 0, 7, 0, 0, PCU_IF_SAPI_PDTCH, c_PCU_DATA);
/* FIXME: how to check this wasn't actually sent and didn't crash BTS?
*/
f_sleep(2.0);
@@ -2859,6 +2880,8 @@
testcase TC_pcu_data_req_pdtch() runs on test_CT {
f_init();
+ PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION,
"data_req_pdtch")));
Change in osmo-sysmon[master]: Add vty option to print output of shell cmd on every poll step
Pau Espin Pedrol has uploaded this change for review. (
https://gerrit.osmocom.org/13304
Change subject: Add vty option to print output of shell cmd on every poll step
..
Add vty option to print output of shell cmd on every poll step
Change-Id: I005773b75f81fa5f6c90f53af508fc6debea208b
---
M doc/examples/osmo-sysmon.cfg
M src/Makefile.am
M src/osysmon.h
A src/osysmon_cmd.c
M src/osysmon_main.c
5 files changed, 178 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/04/13304/1
diff --git a/doc/examples/osmo-sysmon.cfg b/doc/examples/osmo-sysmon.cfg
index f944f72..fb40589 100644
--- a/doc/examples/osmo-sysmon.cfg
+++ b/doc/examples/osmo-sysmon.cfg
@@ -14,3 +14,4 @@
ping example.com
openvpn 127.0.0.1 1234
file os-image /etc/image-datetime
+cmd kernel uname -a
diff --git a/src/Makefile.am b/src/Makefile.am
index f9b79f2..0f324c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,6 +36,7 @@
osmo_sysmon_SOURCES = \
value_node.c \
+ osysmon_cmd.c \
osysmon_ctrl.c \
osysmon_sysinfo.c \
osysmon_rtnl.c \
diff --git a/src/osysmon.h b/src/osysmon.h
index 2f82c47..4fba86c 100644
--- a/src/osysmon.h
+++ b/src/osysmon.h
@@ -13,6 +13,8 @@
struct osysmon_state {
struct rtnl_client_state *rcs;
+ /* list of 'struct osysmon_cmd' */
+ struct llist_head cmds;
/* list of 'struct ctrl client' */
struct llist_head ctrl_clients;
/* list of 'struct openvpn_client' */
@@ -21,6 +23,7 @@
struct llist_head netdevs;
/* list of 'struct osysmon_file' */
struct llist_head files;
+ /* list of ping contexts */
struct ping_state *pings;
};
@@ -36,6 +39,8 @@
PING_NODE,
};
+int osysmon_cmd_init();
+int osysmon_cmd_poll(struct value_node *parent);
int osysmon_ctrl_go_parent(struct vty *vty);
int osysmon_ctrl_init();
diff --git a/src/osysmon_cmd.c b/src/osysmon_cmd.c
new file mode 100644
index 000..d26bf02
--- /dev/null
+++ b/src/osysmon_cmd.c
@@ -0,0 +1,168 @@
+/* Simple Osmocom System Monitor (osysmon): Support for monitoring through
shell commands */
+
+/* (C) 2019 by sysmocom - s.f.m.c. GmbH
+ * All Rights Reserved.
+ * Author: Pau Espin Pedrol
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include "osysmon.h"
+#include "value_node.h"
+
+/***
+ * Data model
+ ***/
+
+struct osysmon_cmd {
+ struct llist_head list;
+ struct {
+ const char *name;
+ const char *cmd;
+ } cfg;
+};
+
+static struct osysmon_cmd *osysmon_cmd_find(const char *name)
+{
+ struct osysmon_cmd *oc;
+
+ llist_for_each_entry(oc, _oss->cmds, list) {
+ if (!strcmp(oc->cfg.name, name))
+ return oc;
+ }
+ return NULL;
+}
+
+static struct osysmon_cmd *osysmon_cmd_add(const char *name, const char *cmd)
+{
+ struct osysmon_cmd *oc;
+
+ if (osysmon_cmd_find(name))
+ return NULL;
+
+ oc = talloc_zero(g_oss, struct osysmon_cmd);
+ OSMO_ASSERT(oc);
+ oc->cfg.name = talloc_strdup(oc, name);
+ oc->cfg.cmd = talloc_strdup(oc, cmd);
+ llist_add_tail(>list, _oss->cmds);
+ return oc;
+}
+
+static void osysmon_cmd_destroy(struct osysmon_cmd *oc)
+{
+ llist_del(>list);
+ talloc_free(oc);
+}
+
+static void osysmon_cmd_run(struct osysmon_cmd *oc, struct value_node *parent)
+{
+ char buf[512];
+ FILE *f;
+ long offset = 0;
+
+ f = popen(oc->cfg.cmd, "r");
+ if (!f) {
+ snprintf(buf, sizeof(buf), "", errno);
+ value_node_add(parent, oc->cfg.name, buf);
+ return;
+ }
+
+ while (fgets(buf + offset, sizeof(buf) - offset, f) != NULL)
+ offset = ftell(f);
+
+ if (offset == 0)
+ value_node_add(parent, oc->cfg.name, "");
+
+ pclose(f);
+
+ value_node_add(parent, oc->cfg.name, buf);
+}
Change in osmo-ttcn3-hacks[master]: Use dumpcap for ttcn3-tcpdump-*.sh if available
Max has posted comments on this change. ( https://gerrit.osmocom.org/13253 ) Change subject: Use dumpcap for ttcn3-tcpdump-*.sh if available .. Patch Set 5: > But I just realized: `apt install wireshark` and I have another copy of > dumpcap in the supported dir :) You can have both: 'dpkg-buildpackage -uc -us -tc' in wireshark checked out from git will make proper .deb packages. -- To view, visit https://gerrit.osmocom.org/13253 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: I77df04d51a469c924cf727f0596cc33565909746 Gerrit-Change-Number: 13253 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 18 Mar 2019 16:11:27 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: Use dumpcap for ttcn3-tcpdump-*.sh if available
osmith has posted comments on this change. ( https://gerrit.osmocom.org/13253 ) Change subject: Use dumpcap for ttcn3-tcpdump-*.sh if available .. Patch Set 5: Code-Review+1 > I'm somewhat reluctant to make it more complex by checking for unusual path > - after all the goal is to make it work with the most common setup, not to > support every distro imaginable. Fair enough. > How common is to have tcpdump and dumpcap in different directories? Building wireshark from git and using "make install" with defaults, as described here: https://osmocom.org/projects/cellular-infrastructure/wiki/Wireshark#Building-and-installing But I just realized: `apt install wireshark` and I have another copy of dumpcap in the supported dir :) -- To view, visit https://gerrit.osmocom.org/13253 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: I77df04d51a469c924cf727f0596cc33565909746 Gerrit-Change-Number: 13253 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 18 Mar 2019 15:28:35 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: Constify pcu_rx_*() parameters
dexter has posted comments on this change. ( https://gerrit.osmocom.org/13298 ) Change subject: Constify pcu_rx_*() parameters .. Patch Set 1: Code-Review+1 > Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13298 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: Ia228c001ca07cfde61b540bec6257b62aec93517 Gerrit-Change-Number: 13298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 18 Mar 2019 15:27:19 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: Use dumpcap for ttcn3-tcpdump-*.sh if available
Max has posted comments on this change. ( https://gerrit.osmocom.org/13253 ) Change subject: Use dumpcap for ttcn3-tcpdump-*.sh if available .. Patch Set 5: (4 comments) The tcpdump might be installed into non-standard location as well but we don't take that into account. How common is to have tcpdump and dumpcap in different directories? https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-start.sh File ttcn3-tcpdump-start.sh: https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-start.sh@5 PS4, Line 5: DUMPCAP=/usr/bin/dumpcap > Mine is in /usr/local/bin/dumpcap. […] Yes, we have to use absolute path because of setcap. I'm somewhat reluctant to make it more complex by checking for unusual path - after all the goal is to make it work with the most common setup, not to support every distro imaginable. https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-start.sh@30 PS4, Line 30: /sbin/setcap > (might not be installed on all distributions there, I would have checked with > "command") Well if it's not installed than this check would simply fail and we're back to tcpdump. https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-start.sh@37 PS4, Line 37: el > How about telling the user why dumpcap is not used? […] Done https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-stop.sh File ttcn3-tcpdump-stop.sh: https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-stop.sh@35 PS4, Line 35: DUMPER="$(ps -q "$(cat "$PIDFILE")" -o comm=)" > Consider replacing `` with $(). […] Done -- To view, visit https://gerrit.osmocom.org/13253 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: I77df04d51a469c924cf727f0596cc33565909746 Gerrit-Change-Number: 13253 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 18 Mar 2019 15:16:53 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: Use dumpcap for ttcn3-tcpdump-*.sh if available
Hello tnt, Daniel Willmann, Harald Welte, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13253 to look at the new patch set (#5). Change subject: Use dumpcap for ttcn3-tcpdump-*.sh if available .. Use dumpcap for ttcn3-tcpdump-*.sh if available Check if dumpcap is installed (either as suid or with appropriate capabilities) and use it for packet capture instead of 'sudo tcpdump' if available. This makes it easier to use TTCN-3 testsuite as regular user without altering sudoers. Change-Id: I77df04d51a469c924cf727f0596cc33565909746 --- M ttcn3-tcpdump-start.sh M ttcn3-tcpdump-stop.sh 2 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/13253/5 -- To view, visit https://gerrit.osmocom.org/13253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I77df04d51a469c924cf727f0596cc33565909746 Gerrit-Change-Number: 13253 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Reviewer: tnt
Change in osmo-bts[master]: Constify pcu_rx_*() parameters
osmith has posted comments on this change. ( https://gerrit.osmocom.org/13298 ) Change subject: Constify pcu_rx_*() parameters .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13298 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: Ia228c001ca07cfde61b540bec6257b62aec93517 Gerrit-Change-Number: 13298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 18 Mar 2019 15:07:46 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: Use dumpcap for ttcn3-tcpdump-*.sh if available
osmith has posted comments on this change. ( https://gerrit.osmocom.org/13253 )
Change subject: Use dumpcap for ttcn3-tcpdump-*.sh if available
..
Patch Set 4: Code-Review-1
(4 comments)
Supporting /usr/local/bin/dumpcap is important IMHO, the rest are nitpicks.
https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-start.sh
File ttcn3-tcpdump-start.sh:
https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-start.sh@5
PS4, Line 5: DUMPCAP=/usr/bin/dumpcap
Mine is in /usr/local/bin/dumpcap. Do we need to use the absolute path?
https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-start.sh@30
PS4, Line 30: /sbin/setcap
(might not be installed on all distributions there, I would have checked with
"command")
https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-start.sh@37
PS4, Line 37: fi
How about telling the user why dumpcap is not used?
else
echo "NOTE: dumpcap doesn't have cap_net_{admin,raw} (or 'setcap' is
missing to check it), falling back to 'sudo tcpdump'."
fi
https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-stop.sh
File ttcn3-tcpdump-stop.sh:
https://gerrit.osmocom.org/#/c/13253/4/ttcn3-tcpdump-stop.sh@35
PS4, Line 35: DUMPER=`ps -q $(cat "$PIDFILE") -o comm=`
Consider replacing `` with $().
https://github.com/koalaman/shellcheck/wiki/Sc2006
DUMPER="$(ps -q "$(cat "$PIDFILE")" -o comm=)"
--
To view, visit https://gerrit.osmocom.org/13253
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: I77df04d51a469c924cf727f0596cc33565909746
Gerrit-Change-Number: 13253
Gerrit-PatchSet: 4
Gerrit-Owner: Max
Gerrit-Reviewer: Daniel Willmann
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: osmith
Gerrit-Reviewer: tnt
Gerrit-Comment-Date: Mon, 18 Mar 2019 14:58:39 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes
Change in osmo-ci[master]: Add scripts/osmocom-list-commits.sh
Max has posted comments on this change. ( https://gerrit.osmocom.org/13301 ) Change subject: Add scripts/osmocom-list-commits.sh .. Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/13301/1/scripts/osmocom-list-commits.sh File scripts/osmocom-list-commits.sh: https://gerrit.osmocom.org/#/c/13301/1/scripts/osmocom-list-commits.sh@51 PS1, Line 51: > Made it optional with the current patch: […] Don't know what would be most common use-case - if it's mostly M2M than it's probably better to default to no-header case. https://gerrit.osmocom.org/#/c/13301/1/scripts/osmocom-list-commits.sh@62 PS1, Line 62: head_commit="$(get_head_commit "$repo")" > The output format was based on an existing Makefile, that's why the '=' is > there. […] Curious, which Makefile is it? -- To view, visit https://gerrit.osmocom.org/13301 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: I91cab0139229e6c1c67e889d33b3d984025bc9da Gerrit-Change-Number: 13301 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 18 Mar 2019 14:47:44 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in libosmocore[master]: Make rate_ctr_group_free() more robust
Max has uploaded this change for review. ( https://gerrit.osmocom.org/13303
Change subject: Make rate_ctr_group_free() more robust
..
Make rate_ctr_group_free() more robust
Properly check and handle empty or NULL input.
Change-Id: I859a91ee4400b3685c05971f8c66bceca6758724
---
M src/rate_ctr.c
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/13303/1
diff --git a/src/rate_ctr.c b/src/rate_ctr.c
index 75302da..b76d687 100644
--- a/src/rate_ctr.c
+++ b/src/rate_ctr.c
@@ -255,8 +255,11 @@
/*! Free the memory for the specified group of counters */
void rate_ctr_group_free(struct rate_ctr_group *grp)
{
- llist_del(>list);
- talloc_free(grp);
+ if (grp) {
+ if (!llist_empty(>list))
+ llist_del(>list);
+ talloc_free(grp);
+ }
}
/*! Add a number to the counter */
--
To view, visit https://gerrit.osmocom.org/13303
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I859a91ee4400b3685c05971f8c66bceca6758724
Gerrit-Change-Number: 13303
Gerrit-PatchSet: 1
Gerrit-Owner: Max
Change in osmo-ci[master]: Add scripts/osmocom-list-commits.sh
osmith has posted comments on this change. ( https://gerrit.osmocom.org/13301 ) Change subject: Add scripts/osmocom-list-commits.sh .. Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/13301/1/scripts/osmocom-list-commits.sh File scripts/osmocom-list-commits.sh: https://gerrit.osmocom.org/#/c/13301/1/scripts/osmocom-list-commits.sh@51 PS1, Line 51: > Would be nice to make header printing optional to facilitate output parsing > by shell scripts. Made it optional with the current patch: NO_HEADER=1 ./osmocom-list-commits.sh https://gerrit.osmocom.org/#/c/13301/1/scripts/osmocom-list-commits.sh@62 PS1, Line 62: head_commit="$(get_head_commit "$repo")" > Is '=' actually required? It doesn't add human readability and seems like an > unnecessary obstacle wh […] The output format was based on an existing Makefile, that's why the '=' is there. But I don't think there's much benefit in keeping it, and you have a good point there. I've removed it. -- To view, visit https://gerrit.osmocom.org/13301 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: I91cab0139229e6c1c67e889d33b3d984025bc9da Gerrit-Change-Number: 13301 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 18 Mar 2019 14:28:38 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-ci[master]: Add scripts/osmocom-list-commits.sh
Hello Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13301 to look at the new patch set (#2). Change subject: Add scripts/osmocom-list-commits.sh .. Add scripts/osmocom-list-commits.sh Generate a table of Osmocom repositories and their latest tag, related commit, and last commit on master. Related: OS#3840 Change-Id: I91cab0139229e6c1c67e889d33b3d984025bc9da --- A scripts/osmocom-list-commits.sh 1 file changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/01/13301/2 -- To view, visit https://gerrit.osmocom.org/13301 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: I91cab0139229e6c1c67e889d33b3d984025bc9da Gerrit-Change-Number: 13301 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-ci[master]: jobs: add osmocom-list-commits.yml
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13302 Change subject: jobs: add osmocom-list-commits.yml .. jobs: add osmocom-list-commits.yml Related: OS#3840 Change-Id: I9a65cb750bbe6c278b9f67eb70bdb36759cb775b --- A jobs/osmocom-list-commits.yml 1 file changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/02/13302/1 diff --git a/jobs/osmocom-list-commits.yml b/jobs/osmocom-list-commits.yml new file mode 100644 index 000..08047b2 --- /dev/null +++ b/jobs/osmocom-list-commits.yml @@ -0,0 +1,39 @@ +--- +- project: +name: Osmocom-list-commits +jobs: + - Osmocom-list-commits + +- job-template: +name: 'Osmocom-list-commits' +project-type: freestyle +defaults: global +description: | +Generate and upload a list of Osmocom git repositories and their latest tag and commits. +node: osmocom-master-debian9 +parameters: + - string: + name: BRANCH + description: | +osmo-ci.git branch where the osmocom-list-commits.sh gets pulled from + default: '*/master' +builders: + - shell: | + scripts/osmocom-list-commits.sh > commits.txt + cat commits.txt + # scp -p 48 commits.txt put-username-h...@rita.osmocom.org:/path/here +scm: + - git: + branches: +- '$BRANCH' + url: git://git.osmocom.org/osmo-ci + git-config-name: 'Jenkins Builder' + git-config-email: 'jenk...@osmocom.org' +triggers: + - timed: "@midnight" +#publishers: +# - email: +# notify-every-unstable-build: true +# recipients: 'jenkins-notificati...@lists.osmocom.org' + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/13302 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: I9a65cb750bbe6c278b9f67eb70bdb36759cb775b Gerrit-Change-Number: 13302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in osmo-bts[master]: oc2g: change log level for calibration file errors to ERROR
Max has posted comments on this change. ( https://gerrit.osmocom.org/13266 ) Change subject: oc2g: change log level for calibration file errors to ERROR .. Patch Set 3: The commit log doesn't seem to match actual change: it's FATAL not ERROR. In general, I think FATAL usually means that application will exit after that error while in this case it continues so ERROR indeed looks more appropriate. -- To view, visit https://gerrit.osmocom.org/13266 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: I32aed25ca7925f1c776f00b37f404a58a85ddbc7 Gerrit-Change-Number: 13266 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Max Gerrit-Comment-Date: Mon, 18 Mar 2019 14:07:35 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-ci[master]: Add scripts/osmocom-list-commits.sh
Max has posted comments on this change. ( https://gerrit.osmocom.org/13301 ) Change subject: Add scripts/osmocom-list-commits.sh .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/13301/1/scripts/osmocom-list-commits.sh File scripts/osmocom-list-commits.sh: https://gerrit.osmocom.org/#/c/13301/1/scripts/osmocom-list-commits.sh@51 PS1, Line 51: printf "$format_str" "# repository" " " "clone URL" "last tag" "last tag commit" "HEAD commit" Would be nice to make header printing optional to facilitate output parsing by shell scripts. -- To view, visit https://gerrit.osmocom.org/13301 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: I91cab0139229e6c1c67e889d33b3d984025bc9da Gerrit-Change-Number: 13301 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 18 Mar 2019 14:01:08 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-ci[master]: Add scripts/osmocom-list-commits.sh
Max has posted comments on this change. ( https://gerrit.osmocom.org/13301 ) Change subject: Add scripts/osmocom-list-commits.sh .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/13301/1/scripts/osmocom-list-commits.sh File scripts/osmocom-list-commits.sh: https://gerrit.osmocom.org/#/c/13301/1/scripts/osmocom-list-commits.sh@62 PS1, Line 62: "=" \ Is '=' actually required? It doesn't add human readability and seems like an unnecessary obstacle when parsing from shell script. -- To view, visit https://gerrit.osmocom.org/13301 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: I91cab0139229e6c1c67e889d33b3d984025bc9da Gerrit-Change-Number: 13301 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 18 Mar 2019 13:58:48 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: Use dumpcap for ttcn3-tcpdump-*.sh if available
Max has posted comments on this change. ( https://gerrit.osmocom.org/13253 ) Change subject: Use dumpcap for ttcn3-tcpdump-*.sh if available .. Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/13253 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: I77df04d51a469c924cf727f0596cc33565909746 Gerrit-Change-Number: 13253 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 18 Mar 2019 13:52:53 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-ci[master]: Add scripts/osmocom-list-commits.sh
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13301
Change subject: Add scripts/osmocom-list-commits.sh
..
Add scripts/osmocom-list-commits.sh
Generate a table of Osmocom repositories and their latest tag, related
commit, and last commit on master.
Related: OS#3840
Change-Id: I91cab0139229e6c1c67e889d33b3d984025bc9da
---
A scripts/osmocom-list-commits.sh
1 file changed, 67 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/01/13301/1
diff --git a/scripts/osmocom-list-commits.sh b/scripts/osmocom-list-commits.sh
new file mode 100755
index 000..b8eca3f
--- /dev/null
+++ b/scripts/osmocom-list-commits.sh
@@ -0,0 +1,67 @@
+#!/bin/sh -e
+
+URL="https://git.osmocom.org;
+REPOS="
+ libosmo-abis
+ libosmocore
+ libosmo-netif
+ libosmo-sccp
+ osmo-bsc
+ osmo-bts
+ osmo-ggsn
+ osmo-hlr
+ osmo-mgw
+ osmo-msc
+ osmo-pcu
+"
+
+# Print commit of HEAD for an Osmocom git repository, e.g.:
+# "f90496f577e78944ce8db1aa5b900477c1e479b0"
+# $1: repository
+get_head_commit() {
+ # git output:
+ # f90496f577e78944ce8db1aa5b900477c1e479b0HEAD
+ ret="$(git ls-remote "$URL/$1" HEAD)"
+ ret="$(echo "$ret" | awk '{print $1}')"
+ echo "$ret"
+}
+
+# Print last tag and related commit for an Osmocom git repository, e.g.:
+# "ec798b89700dcca5c5b28edf1a1cd16ea311f30arefs/tags/1.0.1"
+# $1: repository
+get_last() {
+ # git output:
+ # ec798b89700dcca5c5b28edf1a1cd16ea311f30arefs/tags/1.0.1
+ # eab5f594b0a7cf50ad97b039f73beff42cc8312arefs/tags/1.0.1^{}
+ # ...
+ # 41e7cf115d4148a9f34fcb863b68b2d5370e335drefs/tags/1.3.1^{}
+ # 8a9f12dc2f69bf3a4e861cc9a81b71bdc5f13180refs/tags/3G_2016_09
+ # ee618ecbedec82dfd240334bc87d0d1c806477b0
refs/tags/debian/0.9.13-0_jrsantos.1
+ # a3fdd24af099b449c9856422eb099fb45a5595df
refs/tags/debian/0.9.13-0_jrsantos.1^{}
+ # ...
+ ret="$(git ls-remote --tags "$URL/$1")"
+ ret="$(echo "$ret" | grep 'refs/tags/[0-9.]*$')"
+ ret="$(echo "$ret" | sort -n -k2)"
+ ret="$(echo "$ret" | tail -n 1)"
+ echo "$ret"
+}
+
+# Header
+format_str="%-17s %s %-37s %9s %-40s %s\n"
+printf "$format_str" "# repository" " " "clone URL" "last tag" "last tag
commit" "HEAD commit"
+
+# Table
+for repo in $REPOS; do
+ last="$(get_last "$repo")"
+ last_tag="$(echo "$last" | cut -d/ -f 3)"
+ last_commit="$(echo "$last" | awk '{print $1}')"
+ head_commit="$(get_head_commit "$repo")"
+
+ printf "$format_str" \
+ "$repo.git" \
+ "=" \
+ "$URL/$repo" \
+ "$last_tag" \
+ "$last_commit" \
+ "$head_commit"
+done
--
To view, visit https://gerrit.osmocom.org/13301
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: I91cab0139229e6c1c67e889d33b3d984025bc9da
Gerrit-Change-Number: 13301
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Change in osmo-bts[master]: testme
dexter has abandoned this change. ( https://gerrit.osmocom.org/13299 ) Change subject: testme .. Abandoned -- To view, visit https://gerrit.osmocom.org/13299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I8ab2f766a159a9bf79fe43be74e26d6358620763 Gerrit-Change-Number: 13299 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol
Change in libosmo-sccp[master]: add osmo_sccp_addr_cmp(), osmo_sccp_addr_ri_cmp()
Max has posted comments on this change. ( https://gerrit.osmocom.org/13118 ) Change subject: add osmo_sccp_addr_cmp(), osmo_sccp_addr_ri_cmp() .. Patch Set 2: (1 comment) Do you plan to use osmo_sccp_gt_cmp() or it can be made into static function and not part of the API? https://gerrit.osmocom.org/#/c/13118/2/include/osmocom/sigtran/sccp_sap.h File include/osmocom/sigtran/sccp_sap.h: https://gerrit.osmocom.org/#/c/13118/2/include/osmocom/sigtran/sccp_sap.h@281 PS2, Line 281: int osmo_sccp_addr_cmp(const struct osmo_sccp_addr *a, const struct osmo_sccp_addr *b, uint32_t presence_criteria); You've added 3 functions but only test 2 of them explicitly. -- To view, visit https://gerrit.osmocom.org/13118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie9e2add7bbfae651c04e230d62e37cebeb91b0f5 Gerrit-Change-Number: 13118 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 18 Mar 2019 11:47:33 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-bts[master]: Make gsm_pchan2chan_nr() static
Max has submitted this change and it was merged. (
https://gerrit.osmocom.org/13297 )
Change subject: Make gsm_pchan2chan_nr() static
..
Make gsm_pchan2chan_nr() static
It's only used inside of gsm_data_shared.c so let's mark it as such.
Change-Id: I83f1783efe9dc07c8bf9901ebc94774aef1cd472
---
M include/osmo-bts/gsm_data_shared.h
M src/common/gsm_data_shared.c
2 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
dexter: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmo-bts/gsm_data_shared.h
b/include/osmo-bts/gsm_data_shared.h
index 56ab5b1..72d9710 100644
--- a/include/osmo-bts/gsm_data_shared.h
+++ b/include/osmo-bts/gsm_data_shared.h
@@ -818,8 +818,6 @@
gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class,
const struct abis_om_obj_inst *obj_inst);
-uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
- uint8_t ts_nr, uint8_t lchan_nr);
uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan);
uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan,
enum gsm_phys_chan_config as_pchan);
diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c
index 6703095..b1785b8 100644
--- a/src/common/gsm_data_shared.c
+++ b/src/common/gsm_data_shared.c
@@ -570,7 +570,7 @@
}
/* See Table 10.5.25 of GSM04.08 */
-uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
+static uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
uint8_t ts_nr, uint8_t lchan_nr)
{
uint8_t cbits, chan_nr;
--
To view, visit https://gerrit.osmocom.org/13297
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I83f1783efe9dc07c8bf9901ebc94774aef1cd472
Gerrit-Change-Number: 13297
Gerrit-PatchSet: 2
Gerrit-Owner: Max
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: dexter
Gerrit-Reviewer: osmith
Change in osmo-bts[master]: testme
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13299 ) Change subject: testme .. Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/13299 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: I8ab2f766a159a9bf79fe43be74e26d6358620763 Gerrit-Change-Number: 13299 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 18 Mar 2019 11:36:58 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: Make gsm_pchan2chan_nr() static
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13297 ) Change subject: Make gsm_pchan2chan_nr() static .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13297 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: I83f1783efe9dc07c8bf9901ebc94774aef1cd472 Gerrit-Change-Number: 13297 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 18 Mar 2019 11:36:44 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: main: remove wrong call to oml_fail_rep() on SIGUSR1/2 and SIGABRT
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13296 ) Change subject: main: remove wrong call to oml_fail_rep() on SIGUSR1/2 and SIGABRT .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/13296/1/src/common/main.c File src/common/main.c: https://gerrit.osmocom.org/#/c/13296/1/src/common/main.c@a195 PS1, Line 195: One could argument it actually makes sense to move it upwards under SIGABRT and fall through, but I'm not sure it's a good idea messing around while in SIGABORT since we are modifying stuff in an unknown state. -- To view, visit https://gerrit.osmocom.org/13296 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: I99e637496afff2530425b89c6e9befc76db24906 Gerrit-Change-Number: 13296 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 18 Mar 2019 11:35:45 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-bts[master]: oc2gbts_mgr_calib: don't use fsync() on *FILE pointer
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13271 ) Change subject: oc2gbts_mgr_calib: don't use fsync() on *FILE pointer .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13271 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: I46ffd8c680ba0b445cbbd133d5ce92b79e3d8d87 Gerrit-Change-Number: 13271 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 18 Mar 2019 11:33:31 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: l1_if: add include for missing header file
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13273 ) Change subject: l1_if: add include for missing header file .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13273 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: I95d7e89eed969dd5b3ccff0eebcc6c568196a97d Gerrit-Change-Number: 13273 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 18 Mar 2019 11:33:15 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: pcu_sock: cast to long unsigned int before printing
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13267 ) Change subject: pcu_sock: cast to long unsigned int before printing .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13267 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: If5cb656537b1b73b9361a132801ab47ab7f8a709 Gerrit-Change-Number: 13267 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 18 Mar 2019 11:33:02 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: oc2gbts_mgr_calib: do not return NULL on integer function
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13272 ) Change subject: oc2gbts_mgr_calib: do not return NULL on integer function .. Patch Set 3: Code-Review+2 Thanks for checking. I didn't mean this concrete one, but in general some fixes I see in these series. -- To view, visit https://gerrit.osmocom.org/13272 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: I63b61be2940c59b221089d3d1501371b0116d89a Gerrit-Change-Number: 13272 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 18 Mar 2019 11:31:56 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: Fix the TCH/H decoder and demapper XML definitions
Hello Piotr Krysik, fixeria, Vadim Yanitskiy, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13246 to look at the new patch set (#2). Change subject: Fix the TCH/H decoder and demapper XML definitions .. Fix the TCH/H decoder and demapper XML definitions - The second argument of tch_h_decoder constructor is a string that accepts the value of MultiRate configuration element and not an enum like the tch_f_decoder decoder. - Make the demapper's burst sink required. - Make all parameters visible. - Rename the TCH/H Channel parameter to Sub-channel number. Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd --- M grc/decoding/gsm_tch_h_decoder.xml M grc/demapping/gsm_tch_h_chans_demapper.xml 2 files changed, 24 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/46/13246/2 -- To view, visit https://gerrit.osmocom.org/13246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd Gerrit-Change-Number: 13246 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: Vasil Velichkov Gerrit-Reviewer: fixeria Gerrit-CC: Max
Change in osmo-bts[master]: testme
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/13299 Change subject: testme .. testme Change-Id: I8ab2f766a159a9bf79fe43be74e26d6358620763 --- A test.me 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/99/13299/1 diff --git a/test.me b/test.me new file mode 100644 index 000..e69de29 --- /dev/null +++ b/test.me -- To view, visit https://gerrit.osmocom.org/13299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8ab2f766a159a9bf79fe43be74e26d6358620763 Gerrit-Change-Number: 13299 Gerrit-PatchSet: 1 Gerrit-Owner: dexter
Change in osmo-bts[master]: Make gsm_pchan2chan_nr() static
dexter has posted comments on this change. ( https://gerrit.osmocom.org/13297 ) Change subject: Make gsm_pchan2chan_nr() static .. Patch Set 1: Code-Review+1 > Build Successful > > https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-bts/776/ : > SUCCESS' --verified 1 --code-review 0 -- To view, visit https://gerrit.osmocom.org/13297 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: I83f1783efe9dc07c8bf9901ebc94774aef1cd472 Gerrit-Change-Number: 13297 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 18 Mar 2019 11:10:59 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: Constify pcu_rx_*() parameters
Max has uploaded this change for review. ( https://gerrit.osmocom.org/13298
Change subject: Constify pcu_rx_*() parameters
..
Constify pcu_rx_*() parameters
Use const for data parameter where appropriate.
Change-Id: Ia228c001ca07cfde61b540bec6257b62aec93517
---
M include/osmo-bts/l1sap.h
M src/common/l1sap.c
M src/common/pcu_sock.c
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/13298/1
diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h
index 3cf0ea5..70b4564 100644
--- a/include/osmo-bts/l1sap.h
+++ b/include/osmo-bts/l1sap.h
@@ -71,7 +71,7 @@
/* pcu (socket interface) sends us a data request primitive */
int l1sap_pdch_req(struct gsm_bts_trx_ts *ts, int is_ptcch, uint32_t fn,
- uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len);
+ uint16_t arfcn, uint8_t block_nr, const uint8_t *data, uint8_t len);
/* call-back function for incoming RTP */
void l1sap_rtp_rx_cb(struct osmo_rtp_socket *rs, const uint8_t *rtp_pl,
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index dba08df..a1b0464 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1388,7 +1388,7 @@
/* pcu (socket interface) sends us a data request primitive */
int l1sap_pdch_req(struct gsm_bts_trx_ts *ts, int is_ptcch, uint32_t fn,
- uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len)
+ uint16_t arfcn, uint8_t block_nr, const uint8_t *data, uint8_t len)
{
struct msgb *msg;
struct osmo_phsap_prim *l1sap;
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 60e0f7a..2c7028e 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -466,7 +466,7 @@
}
static int pcu_rx_data_req(struct gsm_bts *bts, uint8_t msg_type,
- struct gsm_pcu_if_data *data_req)
+ const struct gsm_pcu_if_data *data_req)
{
uint8_t is_ptcch;
struct gsm_bts_trx *trx;
@@ -538,7 +538,7 @@
}
static int pcu_rx_pag_req(struct gsm_bts *bts, uint8_t msg_type,
- struct gsm_pcu_if_pag_req *pag_req)
+ const struct gsm_pcu_if_pag_req *pag_req)
{
int rc = 0;
@@ -598,7 +598,7 @@
}
static int pcu_rx_act_req(struct gsm_bts *bts,
- struct gsm_pcu_if_act_req *act_req)
+ const struct gsm_pcu_if_act_req *act_req)
{
struct gsm_bts_trx *trx;
struct gsm_lchan *lchan;
--
To view, visit https://gerrit.osmocom.org/13298
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia228c001ca07cfde61b540bec6257b62aec93517
Gerrit-Change-Number: 13298
Gerrit-PatchSet: 1
Gerrit-Owner: Max
Change in osmo-bts[master]: oc2gbts_mgr_calib: don't use fsync() on *FILE pointer
Hello Daniel Willmann, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13271 to look at the new patch set (#3). Change subject: oc2gbts_mgr_calib: don't use fsync() on *FILE pointer .. oc2gbts_mgr_calib: don't use fsync() on *FILE pointer fsync() takes an integer file descriptor but we have a *FILE pointer here. Lets use fileno() first to convert the integer file descriptor to a FILE pointer. Change-Id: I46ffd8c680ba0b445cbbd133d5ce92b79e3d8d87 --- M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/71/13271/3 -- To view, visit https://gerrit.osmocom.org/13271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I46ffd8c680ba0b445cbbd133d5ce92b79e3d8d87 Gerrit-Change-Number: 13271 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Pau Espin Pedrol
Change in osmo-bts[master]: Make gsm_pchan2chan_nr() static
Max has uploaded this change for review. ( https://gerrit.osmocom.org/13297
Change subject: Make gsm_pchan2chan_nr() static
..
Make gsm_pchan2chan_nr() static
It's only used inside of gsm_data_shared.c so let's mark it as such.
Change-Id: I83f1783efe9dc07c8bf9901ebc94774aef1cd472
---
M include/osmo-bts/gsm_data_shared.h
M src/common/gsm_data_shared.c
2 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/13297/1
diff --git a/include/osmo-bts/gsm_data_shared.h
b/include/osmo-bts/gsm_data_shared.h
index 56ab5b1..72d9710 100644
--- a/include/osmo-bts/gsm_data_shared.h
+++ b/include/osmo-bts/gsm_data_shared.h
@@ -818,8 +818,6 @@
gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class,
const struct abis_om_obj_inst *obj_inst);
-uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
- uint8_t ts_nr, uint8_t lchan_nr);
uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan);
uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan,
enum gsm_phys_chan_config as_pchan);
diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c
index 6703095..b1785b8 100644
--- a/src/common/gsm_data_shared.c
+++ b/src/common/gsm_data_shared.c
@@ -570,7 +570,7 @@
}
/* See Table 10.5.25 of GSM04.08 */
-uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
+static uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
uint8_t ts_nr, uint8_t lchan_nr)
{
uint8_t cbits, chan_nr;
--
To view, visit https://gerrit.osmocom.org/13297
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83f1783efe9dc07c8bf9901ebc94774aef1cd472
Gerrit-Change-Number: 13297
Gerrit-PatchSet: 1
Gerrit-Owner: Max
Change in osmo-bts[master]: oc2gbts_mgr_vty: remove calls to vty_install_default()
dexter has submitted this change and it was merged. (
https://gerrit.osmocom.org/13270 )
Change subject: oc2gbts_mgr_vty: remove calls to vty_install_default()
..
oc2gbts_mgr_vty: remove calls to vty_install_default()
The function vty_install_default() is deprecated and throws a compiler
warning that suggests to remove it, so lets remove it.
Change-Id: I1a4afb6e352bed9a5af794b39b984a7ddef36e08
---
M src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c
1 file changed, 0 insertions(+), 15 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c
b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c
index ef52739..7e80e03 100644
--- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c
+++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c
@@ -878,46 +878,37 @@
install_node(_node, config_write_mgr);
install_element(CONFIG_NODE, _mgr_cmd);
- vty_install_default(MGR_NODE);
/* install the limit nodes */
install_node(_supply_temp_node, config_write_dummy);
install_element(MGR_NODE, _limit_supply_temp_cmd);
- vty_install_default(LIMIT_SUPPLY_TEMP_NODE);
install_node(_soc_node, config_write_dummy);
install_element(MGR_NODE, _limit_soc_temp_cmd);
- vty_install_default(LIMIT_SOC_NODE);
install_node(_fpga_node, config_write_dummy);
install_element(MGR_NODE, _limit_fpga_temp_cmd);
- vty_install_default(LIMIT_FPGA_NODE);
if (oc2gbts_option_get(OC2GBTS_OPTION_RMS_FWD) ||
oc2gbts_option_get(OC2GBTS_OPTION_RMS_REFL)) {
install_node(_rmsdet_node, config_write_dummy);
install_element(MGR_NODE, _limit_rmsdet_temp_cmd);
- vty_install_default(LIMIT_RMSDET_NODE);
}
install_node(_ocxo_node, config_write_dummy);
install_element(MGR_NODE, _limit_ocxo_temp_cmd);
- vty_install_default(LIMIT_OCXO_NODE);
install_node(_tx_temp_node, config_write_dummy);
install_element(MGR_NODE, _limit_tx_temp_cmd);
- vty_install_default(LIMIT_TX_TEMP_NODE);
if (oc2gbts_option_get(OC2GBTS_OPTION_PA_TEMP)) {
install_node(_pa_temp_node, config_write_dummy);
install_element(MGR_NODE, _limit_pa_temp_cmd);
- vty_install_default(LIMIT_PA_TEMP_NODE);
}
install_node(_supply_volt_node, config_write_dummy);
install_element(MGR_NODE, _limit_supply_volt_cmd);
register_limit(LIMIT_SUPPLY_VOLT_NODE, MGR_LIMIT_TYPE_VOLT);
- vty_install_default(LIMIT_SUPPLY_VOLT_NODE);
if (oc2gbts_option_get(OC2GBTS_OPTION_PA) &&
oc2gbts_option_get(OC2GBTS_OPTION_RMS_FWD) &&
@@ -925,23 +916,19 @@
install_node(_vswr_node, config_write_dummy);
install_element(MGR_NODE, _limit_vswr_cmd);
register_limit(LIMIT_VSWR_NODE, MGR_LIMIT_TYPE_VSWR);
- vty_install_default(LIMIT_VSWR_NODE);
}
install_node(_supply_pwr_node, config_write_dummy);
install_element(MGR_NODE, _limit_supply_pwr_cmd);
register_limit(LIMIT_SUPPLY_PWR_NODE, MGR_LIMIT_TYPE_PWR);
- vty_install_default(LIMIT_SUPPLY_PWR_NODE);
if (oc2gbts_option_get(OC2GBTS_OPTION_PA)) {
install_node(_pa_pwr_node, config_write_dummy);
install_element(MGR_NODE, _limit_pa_pwr_cmd);
- vty_install_default(LIMIT_PA_PWR_NODE);
}
install_node(_gps_fix_node, config_write_dummy);
install_element(MGR_NODE, _limit_gps_fix_cmd);
- vty_install_default(LIMIT_GPS_FIX_NODE);
/* install the normal node */
install_node(_norm_node, config_write_dummy);
@@ -952,12 +939,10 @@
install_node(_warn_node, config_write_dummy);
install_element(MGR_NODE, _action_warn_cmd);
register_action(ACT_WARN_NODE);
- vty_install_default(ACT_WARN_NODE);
install_node(_crit_node, config_write_dummy);
install_element(MGR_NODE, _action_critical_cmd);
register_action(ACT_CRIT_NODE);
- vty_install_default(ACT_CRIT_NODE);
/* install LED pattern command for debugging purpose */
install_element_ve(_led_pattern_cmd);
--
To view, visit https://gerrit.osmocom.org/13270
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a4afb6e352bed9a5af794b39b984a7ddef36e08
Gerrit-Change-Number: 13270
Gerrit-PatchSet: 3
Gerrit-Owner: dexter
Gerrit-Reviewer: Daniel Willmann
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: dexter
Change in osmo-bts[master]: oml: make oml_tx_failure_event_rep() public
dexter has submitted this change and it was merged. (
https://gerrit.osmocom.org/13264 )
Change subject: oml: make oml_tx_failure_event_rep() public
..
oml: make oml_tx_failure_event_rep() public
The static function oml_tx_failure_event_rep() is a lot easier to use
than the currently implemented signal scheme. Lets make it public so
that we can quickly generate failure event reports.
Change-Id: I9c4601840a06119f35cfe4da453fff3b293fe615
Related: OS#3823
---
M include/osmo-bts/oml.h
M src/common/oml.c
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, approved
Max: Looks good to me, but someone else must approve
diff --git a/include/osmo-bts/oml.h b/include/osmo-bts/oml.h
index 4dca2f8..a87d438 100644
--- a/include/osmo-bts/oml.h
+++ b/include/osmo-bts/oml.h
@@ -47,4 +47,7 @@
/* Transmit failure event report */
void oml_fail_rep(uint16_t cause_value, const char *fmt, ...);
+int oml_tx_failure_event_rep(const struct gsm_abis_mo *mo, uint16_t
cause_value,
+const char *fmt, ...);
+
#endif // _OML_H */
diff --git a/src/common/oml.c b/src/common/oml.c
index b04caf6..ac388d1 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -67,8 +67,8 @@
}
/* 3GPP TS 12.21 § 8.8.2 */
-static int oml_tx_failure_event_rep(const struct gsm_abis_mo *mo, uint16_t
cause_value,
- const char *fmt, ...)
+int oml_tx_failure_event_rep(const struct gsm_abis_mo *mo, uint16_t
cause_value,
+const char *fmt, ...)
{
struct msgb *nmsg;
va_list ap;
--
To view, visit https://gerrit.osmocom.org/13264
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c4601840a06119f35cfe4da453fff3b293fe615
Gerrit-Change-Number: 13264
Gerrit-PatchSet: 3
Gerrit-Owner: dexter
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: dexter
Change in osmo-pcu[master]: MS store: move test helper to unit test
osmith has posted comments on this change. ( https://gerrit.osmocom.org/13213 ) Change subject: MS store: move test helper to unit test .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2a5b90779051af894fe15d957c1d26f0a142f33 Gerrit-Change-Number: 13213 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 18 Mar 2019 10:29:03 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: oc2g: change log level for calibration file errors to ERROR
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13266 to look at the new patch set (#3). Change subject: oc2g: change log level for calibration file errors to ERROR .. oc2g: change log level for calibration file errors to ERROR The log level of the messages that notify calibration file loading problems is NOTICE, but since it is a severe problem when calibration can not be loaded lets change it to ERROR Change-Id: I32aed25ca7925f1c776f00b37f404a58a85ddbc7 Related: OS#3823 --- M src/osmo-bts-oc2g/calib_file.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/13266/3 -- To view, visit https://gerrit.osmocom.org/13266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I32aed25ca7925f1c776f00b37f404a58a85ddbc7 Gerrit-Change-Number: 13266 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-bts[master]: oml: use oml_tx_failure_event_rep() instead of signals to SS_FAIL
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13269 to look at the new patch set (#2). Change subject: oml: use oml_tx_failure_event_rep() instead of signals to SS_FAIL .. oml: use oml_tx_failure_event_rep() instead of signals to SS_FAIL At some locations in the code a signal to SS_FAIL is dispatched in order to trigger the sending of an OML failure event report in oml.c. This is a bit overcomplicated for the task. Lets use oml_tx_failure_event_rep() to send the failure event reports and lets remove the signal handler for SS_FAIL. Change-Id: Ie4fce1273a19cc14f37ff6fc7582b2945c7e7c47 Related: OS#3843 --- M include/osmo-bts/signal.h M src/common/bts_ctrl_commands.c M src/common/oml.c M src/common/pcu_sock.c 4 files changed, 10 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/69/13269/2 -- To view, visit https://gerrit.osmocom.org/13269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie4fce1273a19cc14f37ff6fc7582b2945c7e7c47 Gerrit-Change-Number: 13269 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-bts[master]: oml: use oml_tx_failure_event_rep() instead of oml_fail_rep()
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13268 to look at the new patch set (#2). Change subject: oml: use oml_tx_failure_event_rep() instead of oml_fail_rep() .. oml: use oml_tx_failure_event_rep() instead of oml_fail_rep() The function oml_tx_failure_event_rep() replaces oml_fail_rep(), so lets use only oml_tx_failure_event_rep() and remove oml_fail_rep() Change-Id: I83c4fa9ebd519299fd54b37b5d95d6d7c1da24f6 Related: OS#3843 --- M include/osmo-bts/oml.h M src/common/bts.c M src/common/l1sap.c M src/common/main.c M src/common/oml.c M src/common/rsl.c 6 files changed, 26 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/13268/2 -- To view, visit https://gerrit.osmocom.org/13268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I83c4fa9ebd519299fd54b37b5d95d6d7c1da24f6 Gerrit-Change-Number: 13268 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Pau Espin Pedrol
Change in osmo-bts[master]: main: remove wrong call to oml_fail_rep() on SIGUSR1/2 and SIGABRT
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/13296 Change subject: main: remove wrong call to oml_fail_rep() on SIGUSR1/2 and SIGABRT .. main: remove wrong call to oml_fail_rep() on SIGUSR1/2 and SIGABRT SIGUSR1/2 and SIGABRT should not trigger a failure event report on OML since we only use it to get an intermediate talloc report. (In case of SIGUSR1/2 without leaving the process.) Change-Id: I99e637496afff2530425b89c6e9befc76db24906 --- M src/common/main.c 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/13296/1 diff --git a/src/common/main.c b/src/common/main.c index 3a53813..9575f57 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -192,9 +192,6 @@ case SIGABRT: case SIGUSR1: case SIGUSR2: - oml_fail_rep(OSMO_EVT_CRIT_PROC_STOP, -"BTS: signal %d (%s) received", signal, -strsignal(signal)); talloc_report_full(tall_bts_ctx, stderr); break; default: -- To view, visit https://gerrit.osmocom.org/13296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I99e637496afff2530425b89c6e9befc76db24906 Gerrit-Change-Number: 13296 Gerrit-PatchSet: 1 Gerrit-Owner: dexter
Change in osmo-bts[master]: pcu_sock: cast to long unsigned int before printing
Max has posted comments on this change. ( https://gerrit.osmocom.org/13267 ) Change subject: pcu_sock: cast to long unsigned int before printing .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13267 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: If5cb656537b1b73b9361a132801ab47ab7f8a709 Gerrit-Change-Number: 13267 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 18 Mar 2019 09:06:09 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: l1_if: add include for missing header file
Max has posted comments on this change. ( https://gerrit.osmocom.org/13273 ) Change subject: l1_if: add include for missing header file .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13273 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: I95d7e89eed969dd5b3ccff0eebcc6c568196a97d Gerrit-Change-Number: 13273 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 18 Mar 2019 09:05:31 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: l1_if: add include for missing header file
Hello Pau Espin Pedrol, Daniel Willmann, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13273 to look at the new patch set (#2). Change subject: l1_if: add include for missing header file .. l1_if: add include for missing header file the function bts_cbch_get() is used in l1_if.c. The function is declared in cbch.h. Lets include this header file in order to be complete. Change-Id: I95d7e89eed969dd5b3ccff0eebcc6c568196a97d --- M src/osmo-bts-oc2g/l1_if.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/13273/2 -- To view, visit https://gerrit.osmocom.org/13273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I95d7e89eed969dd5b3ccff0eebcc6c568196a97d Gerrit-Change-Number: 13273 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-bts[master]: oc2gbts_mgr_calib: don't use fsync() von *FILE pointer
Hello Daniel Willmann, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13271 to look at the new patch set (#2). Change subject: oc2gbts_mgr_calib: don't use fsync() von *FILE pointer .. oc2gbts_mgr_calib: don't use fsync() von *FILE pointer fsync() takes an integer file descriptor but we have a *FILE pointer here. Lets use fflush() then. Change-Id: I46ffd8c680ba0b445cbbd133d5ce92b79e3d8d87 --- M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/71/13271/2 -- To view, visit https://gerrit.osmocom.org/13271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I46ffd8c680ba0b445cbbd133d5ce92b79e3d8d87 Gerrit-Change-Number: 13271 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Pau Espin Pedrol
Change in osmo-bts[master]: pcu_sock: cast to long unsigned int before printing
Hello Pau Espin Pedrol, Daniel Willmann, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13267 to look at the new patch set (#2). Change subject: pcu_sock: cast to long unsigned int before printing .. pcu_sock: cast to long unsigned int before printing When using %lu and sizeof() for printing the compiler may throw a warning. Lets prevent this by casting to long unsigned int. Change-Id: If5cb656537b1b73b9361a132801ab47ab7f8a709 --- M src/common/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/13267/2 -- To view, visit https://gerrit.osmocom.org/13267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If5cb656537b1b73b9361a132801ab47ab7f8a709 Gerrit-Change-Number: 13267 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter
Change in osmo-bts[master]: oc2gbts_mgr_calib: do not return NULL on integer function
dexter has posted comments on this change. ( https://gerrit.osmocom.org/13272 ) Change subject: oc2gbts_mgr_calib: do not return NULL on integer function .. Patch Set 1: > I'm almost sure I did the same kind of fixes for LC-15 at some > point in the past. Please check if you fix it the same way as in > LC-15 to make it easier later to merge duplicated code. I have checked the lc15 specific part including lc15bts_mgr_calib.c, but I could not find any function like xxx_par_get/set_uptime(). -- To view, visit https://gerrit.osmocom.org/13272 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: I63b61be2940c59b221089d3d1501371b0116d89a Gerrit-Change-Number: 13272 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 18 Mar 2019 08:42:44 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-bts[master]: pcu_sock: cast to long unsigned int before printing
dexter has posted comments on this change. ( https://gerrit.osmocom.org/13267 ) Change subject: pcu_sock: cast to long unsigned int before printing .. Patch Set 1: > Agree with Harald I see, didn't know about the %z before. Thanks for the hint. I hope it is now correct. -- To view, visit https://gerrit.osmocom.org/13267 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: If5cb656537b1b73b9361a132801ab47ab7f8a709 Gerrit-Change-Number: 13267 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 18 Mar 2019 08:21:52 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-bts[master]: lc15: remove unused define constant FACTORY_ROM_PATH
dexter has submitted this change and it was merged. (
https://gerrit.osmocom.org/13263 )
Change subject: lc15: remove unused define constant FACTORY_ROM_PATH
..
lc15: remove unused define constant FACTORY_ROM_PATH
Change-Id: I76d47471a8480da5a7cb4a11655d5150d4f33508
Related: OS#3823
---
M src/osmo-bts-litecell15/misc/lc15bts_par.h
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Harald Welte: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bts-litecell15/misc/lc15bts_par.h
b/src/osmo-bts-litecell15/misc/lc15bts_par.h
index 217ae5f..7429565 100644
--- a/src/osmo-bts-litecell15/misc/lc15bts_par.h
+++ b/src/osmo-bts-litecell15/misc/lc15bts_par.h
@@ -3,7 +3,6 @@
#include
-#define FACTORY_ROM_PATH "/mnt/rom/factory"
#define USER_ROM_PATH "/mnt/storage/var/run/lc15bts-mgr"
enum lc15bts_par {
--
To view, visit https://gerrit.osmocom.org/13263
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I76d47471a8480da5a7cb4a11655d5150d4f33508
Gerrit-Change-Number: 13263
Gerrit-PatchSet: 3
Gerrit-Owner: dexter
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: dexter
Change in osmo-bts[master]: oc2g: remove unused define constant FACTORY_ROM_PATH
dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/13262 ) Change subject: oc2g: remove unused define constant FACTORY_ROM_PATH .. oc2g: remove unused define constant FACTORY_ROM_PATH Change-Id: I5eb12332568c85bfd2dd83eb5ef1d9c1c9bbfd27 Related: OS#3823 --- M src/osmo-bts-oc2g/misc/oc2gbts_par.h 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_par.h b/src/osmo-bts-oc2g/misc/oc2gbts_par.h index 588a3c3..0bdbed9 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_par.h +++ b/src/osmo-bts-oc2g/misc/oc2gbts_par.h @@ -3,7 +3,6 @@ #include -#define FACTORY_ROM_PATH "/mnt/rom/factory" #define USER_ROM_PATH "/var/run/oc2gbts-mgr" #define UPTIME_TMP_PATH"/tmp/uptime" -- To view, visit https://gerrit.osmocom.org/13262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5eb12332568c85bfd2dd83eb5ef1d9c1c9bbfd27 Gerrit-Change-Number: 13262 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter
