November 2022 - gerrit-log - lists.osmocom.org

Change in simtrace2[master]: firmware/sniffer: Rename global variable 'wt' to 'g_wt'

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/30188 ) Change subject: firmware/sniffer: Rename global variable 'wt' to 'g_wt' ...................................................................... firmware/sniffer: Rename global variable 'wt' to 'g_wt' It's a bad idea to have a two-character global variable which might easily clash with local variable names. Change-Id: Ic2fac64129d2772a1923f35e48582be3b130a0f2 --- M firmware/libcommon/source/sniffer.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/88/30188/1 diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 6aa5582..56f0b64 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -189,7 +189,7 @@ /*! Waiting Time (WT) * @note defined in ISO/IEC 7816-3:2006(E) section 8.1 and 10.2 */ -static uint32_t wt = 9600; +static uint32_t g_wt = 9600; /*------------------------------------------------------------------------------ * Internal functions @@ -219,8 +219,8 @@ if (0 != d) { wt_d = d; } - wt = wt_wi * 960UL * wt_d; - TRACE_INFO("WT updated (wi=%u, d=%u, cause=%s) to %lu ETU\n\r", wi, d, cause, wt); + g_wt = wt_wi * 960UL * wt_d; + TRACE_INFO("WT updated (wi=%u, d=%u, cause=%s) to %lu ETU\n\r", wi, d, cause, g_wt); } /*! Allocate USB buffer and push + initialize simtrace_msg_hdr @@ -845,7 +845,7 @@ /* Just set the flag and let the main loop handle it */ change_flags |= SNIFF_CHANGE_FLAG_TIMEOUT_WT; /* Reset timeout value */ - wt_remaining = wt; + wt_remaining = g_wt; } else { wt_remaining -= (sniff_usart.base->US_RTOR & 0xffff); /* be sure to subtract the actual timeout since the new might not have been set and reloaded yet */ } @@ -947,7 +947,7 @@ /* Only receive data when sniffing */ USART_SetReceiverEnabled(sniff_usart.base, 1); /* Enable Receiver time-out to detect waiting time (WT) time-out (e.g. unresponsive cards) */ - sniff_usart.base->US_RTOR = wt; + sniff_usart.base->US_RTOR = g_wt; /* Enable interrupt to indicate when data has been received or timeout occurred */ USART_EnableIt(sniff_usart.base, US_IER_RXRDY | US_IER_TIMEOUT); /* Set USB priority lower than USART to not miss sniffing data (both at 0 per default) */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic2fac64129d2772a1923f35e48582be3b130a0f2 Gerrit-Change-Number: 30188 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Log cause of WT change

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/30187 ) Change subject: firmware/sniffer: Log cause of WT change ...................................................................... firmware/sniffer: Log cause of WT change Change-Id: I14245c0ca96a258146e48bb9909efd9f8150f5ac --- M firmware/libcommon/source/sniffer.c 1 file changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/87/30187/1 diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index cca140d..6aa5582 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -204,10 +204,11 @@ /*! Update Waiting Time (WT) * @param[in] wi Waiting Integer (0 if unchanged) * @param[in] d Baud Rate divider (0 if unchanged) + * @param[in] cause String describing the source of the change * @note set wt to be used by the receiver timeout * @note defined in ISO/IEC 7816-3:2006(E) section 8.1 and 10.2 */ -static void update_wt(uint8_t wi, uint8_t d) +static void update_wt(uint8_t wi, uint8_t d, const char *cause) { static uint8_t wt_wi = 10; /* Waiting time Integer (WI), used to calculate the Waiting Time (WT) */ static uint8_t wt_d = 1; /* baud rate adjustment integer (the actual value, not the table index) */ @@ -219,7 +220,7 @@ wt_d = d; } wt = wt_wi * 960UL * wt_d; - TRACE_INFO("WT updated to %lu ETU\n\r", wt); + TRACE_INFO("WT updated (wi=%u, d=%u, cause=%s) to %lu ETU\n\r", wi, d, cause, wt); } /*! Allocate USB buffer and push + initialize simtrace_msg_hdr @@ -287,7 +288,7 @@ switch (iso_state_new) { case ISO7816_S_RESET: update_fidi(&sniff_usart, 0x11); /* reset baud rate to default Di/Fi values */ - update_wt(10, 1); /* reset WT time-out */ + update_wt(10, 1, "RESET"); /* reset WT time-out */ break; case ISO7816_S_WAIT_ATR: rbuf_reset(&sniff_buffer); /* reset buffer for new communication */ @@ -478,9 +479,9 @@ /* retrieve WI encoded in TC2*/ if (ATR_S_WAIT_TC == g_atr.state && 2==i) { if (0 == byte) { - update_wt(10, 0); + update_wt(10, 0, "TC2=0"); } else { - update_wt(byte, 0); + update_wt(byte, 0, "TC2"); } } if (y & 0x80) { @@ -675,7 +676,7 @@ TRACE_INFO("PPS negotiation successful: Fn=%u Dn=%u\n\r", iso7816_3_fi_table[fn], iso7816_3_di_table[dn]); update_fidi(&sniff_usart, pps_cur[2]); - update_wt(0, iso7816_3_di_table[dn]); + update_wt(0, iso7816_3_di_table[dn], "PPS"); usb_send_fidi(pps_cur[2]); /* send Fi/Di change notification to host software over USB */ } else { /* checksum is invalid */ TRACE_INFO("PPS negotiation failed\n\r"); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I14245c0ca96a258146e48bb9909efd9f8150f5ac Gerrit-Change-Number: 30187 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmocom-api: add jenkins-job-builder config

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30185 ) Change subject: jobs/osmocom-api: add jenkins-job-builder config ...................................................................... jobs/osmocom-api: add jenkins-job-builder config Add a jenkins-job-builder configuration for the existing Osmocom_API job and refactor it to not use the deprecated multi-scm plugin. Also update the git clone urls. Related: OS#5763 Change-Id: Ia518979307ce633ccd2c431a8e8eea866da2a50d --- A jobs/osmocom-api.yml 1 file changed, 89 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/jobs/osmocom-api.yml b/jobs/osmocom-api.yml new file mode 100644 index 0000000..f91779d --- /dev/null +++ b/jobs/osmocom-api.yml @@ -0,0 +1,89 @@ +- job: + concurrent: false + description: This job builds the doxygen API documentation for latest libosmo* + and uploads it to <a href="https://downloads.osmocom.org/api/latest/" + >https://downloads.osmocom.org/api/latest/</a> + name: Osmocom_API + node: osmocom-master-debian9 + project-type: freestyle + publishers: + - email: + notify-every-unstable-build: true + recipients: jenkins-notifications(a)lists.osmocom.org + triggers: + - timed: "H H * * *" + wrappers: + - ssh-agent-credentials: + users: + - api@osmocom + parameters: + - string: + name: BRANCH + description: osmo-ci.git branch + default: 'master' + scm: + - git: + branches: + - '$BRANCH' + url: https://gerrit.osmocom.org/osmo-ci + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins(a)osmocom.org' + wipe-workspace: true + builders: + - shell: | + # Repositories for which doxygen documentation will be generated and + # uploaded, also dependencies which need to be built + repos_api=" + libosmocore + libosmo-abis + libosmo-dsp + libosmo-netif + libosmo-sccp + osmo-gmr" + + # Source common.sh from osmo-ci.git for osmo_git_clone_url() + . scripts/common.sh + + # Put git repos and install data in a subdir, so it isn't in the root + # of the cloned osmo-ci.git repository + mkdir _osmocom_api + cd _osmocom_api + + # Prepare pkgconfig path + export PKG_CONFIG_PATH=$PWD/install/lib/pkgconfig + mkdir -p "$PKG_CONFIG_PATH" + + # Prepare known_hosts + cat > known_hosts <<EOF + [ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9 + [ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= + [ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX + EOF + + # Clone and build the repositories + for i in $repos_api; do + git clone "$(osmo_git_clone_url "$i")" + cd "$i" + autoreconf -fi + ./configure \ + --prefix=$PWD/../install \ + --with-systemdsystemunitdir=no + make $PARALLEL_MAKE install + cd .. + done + + # Upload all docs + for i in $repos_api; do + if ! [ -d "$i"/doc ]; then + # e.g. libosmo-abis is built as dependency for others but doesn't + # have its own doxygen documentation as of writing + continue + fi + + rsync \ + -avz \ + --delete \ + -e "ssh -o 'UserKnownHostsFile=known_hosts' -p 48" \ + ./"$i"/doc/ \ + api@ftp.osmocom.org:web-files/latest/"$i"/ + done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia518979307ce633ccd2c431a8e8eea866da2a50d Gerrit-Change-Number: 30185 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/coverity: remove display-name

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30186 ) Change subject: jobs/coverity: remove display-name ...................................................................... jobs/coverity: remove display-name Make it consistent with all other jobs and don't set a display name. This way the job will be sorted properly in the list of jobs and won't weirdly jump to the top when loading the page. Change-Id: Idf1a8db45daf75ae110cfae3042627fbcdd14575 --- M jobs/coverity.yml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/jobs/coverity.yml b/jobs/coverity.yml index 74803c7..242d1aa 100644 --- a/jobs/coverity.yml +++ b/jobs/coverity.yml @@ -9,7 +9,6 @@ project-type: freestyle defaults: global description: 'Generated by job-builder' - display-name: 'Coverity-Upload' node: coverity builders: - shell: | -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idf1a8db45daf75ae110cfae3042627fbcdd14575 Gerrit-Change-Number: 30186 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmocom-api: add jenkins-job-builder config

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30185 ) Change subject: jobs/osmocom-api: add jenkins-job-builder config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia518979307ce633ccd2c431a8e8eea866da2a50d Gerrit-Change-Number: 30185 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Nov 2022 14:02:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/coverity: remove display-name

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30186 ) Change subject: jobs/coverity: remove display-name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idf1a8db45daf75ae110cfae3042627fbcdd14575 Gerrit-Change-Number: 30186 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Nov 2022 14:02:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in libosmo-netif[master]: tests/osmux: Test incoming RTP stream with seqnum jumps during wrapar...

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30184 ) Change subject: tests/osmux: Test incoming RTP stream with seqnum jumps during wraparound ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Idd3a609452767f9c480c7c5ba9fc2a3e0a499968 Gerrit-Change-Number: 30184 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Nov 2022 13:48:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Handle current to-be-transmitted packet size when creating for...

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30174 ) Change subject: osmux: Handle current to-be-transmitted packet size when creating forged RTP packets to fill holes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4ea435bfb2490a375ad3e5068ee926e48b53cf5c Gerrit-Change-Number: 30174 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Nov 2022 13:48:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: test replay of lot RTP packets when generating osmux batches

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30173 ) Change subject: osmux: test replay of lot RTP packets when generating osmux batches ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I913c2ccfc3ad4e7ed801344d64e33e166a0817cf Gerrit-Change-Number: 30173 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Nov 2022 13:24:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Add data[0] field to osmux_hdr

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30172 ) Change subject: osmux: Add data[0] field to osmux_hdr ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I27750c38f12d3d84dbaac5beff166d78ffa6c45b Gerrit-Change-Number: 30172 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Nov 2022 13:22:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022