jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42646?usp=email )
Change subject: Fix bankd connection at RemsimClient_Tests.TC_bank_disconnect_reconnect
......................................................................
Fix bankd connection at RemsimClient_Tests.TC_bank_disconnect_reconnect
After each connection (initial connection and reconnect), the test must
wait for the bankd connection to be fully established. Previously the
IPA/RSPRO emulation failed, because the socket was closed before sending
the acknowledgemen, leading to a 'Broken pipe' error.
Change-Id: I0a8b339bcc4136442994b8825904df8aaf9aa95d
---
M remsim/RemsimClient_Tests.ttcn
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/42646/1
diff --git a/remsim/RemsimClient_Tests.ttcn b/remsim/RemsimClient_Tests.ttcn
index d747eef..5d6db82 100644
--- a/remsim/RemsimClient_Tests.ttcn
+++ b/remsim/RemsimClient_Tests.ttcn
@@ -170,6 +170,7 @@
/* expect inbound connectClientReq on simulated bankd */
as_connectClientReq(i := 1);
+ /* Wait for bankd connection to be established. */
f_sleep(1.0);
/* configure client to disconnect from [simulated] bankd */
@@ -190,6 +191,9 @@
/* expect inbound connect on simulated bankd */
as_connectClientReq(i := 1);
+ /* Wait for bankd connection to be established. */
+ f_sleep(1.0);
+
setverdict(pass);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42646?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0a8b339bcc4136442994b8825904df8aaf9aa95d
Gerrit-Change-Number: 42646
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42647?usp=email )
Change subject: Fix access pcscd in various RemsimBankd_Tests
......................................................................
Fix access pcscd in various RemsimBankd_Tests
Access to pcscd was denied, so that bankd never conneced to the reader.
This caused TC_createMapping_exchangeTPDU to fail, because it requires
connection to virtual smart card for this test
Change-Id: Ibae1c5167daa0157058bc40ce1857c1e6bb9da31
---
M remsim/testenv_bankd.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/42647/1
diff --git a/remsim/testenv_bankd.cfg b/remsim/testenv_bankd.cfg
index b8ebaa7..62df381 100644
--- a/remsim/testenv_bankd.cfg
+++ b/remsim/testenv_bankd.cfg
@@ -5,7 +5,7 @@
[pcscd]
prepare=require_vsmartcard_vpcd.sh
-program=pcscd -f -d
+program=pcscd -f -d --disable-polkit
make=no
package=pcscd
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42647?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibae1c5167daa0157058bc40ce1857c1e6bb9da31
Gerrit-Change-Number: 42647
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/42645?usp=email )
Change subject: Fix: Remove slot mapping at bankd when client disconnects
......................................................................
Fix: Remove slot mapping at bankd when client disconnects
If a client disconnects before removing the slot mapping, the slotmap
entry will not be removed automatically. A subsequent client connection
for the same mapping will then trigger the the error: “ignoring
identical slotmap.”
In a setup with multiple readers, there are multiple bankd worker
threads. If a client re-connects, but if its connection is accepted by
a different thread, subsequent reader access or unmapping will fail.
There will be no mapping at the new thread.
The approach of this fix is to remove the slot mapping, if the client
connection to the worker thread terminates.
Change-Id: I2fd03490e2506c55104309a0ef952389119023b8
---
M src/bankd/bankd_main.c
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/45/42645/1
diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c
index 5e33b41..99a5949 100644
--- a/src/bankd/bankd_main.c
+++ b/src/bankd/bankd_main.c
@@ -1102,6 +1102,16 @@
close(g_worker->client.fd);
memset(&g_worker->client.peer_addr, 0, sizeof(g_worker->client.peer_addr));
g_worker->client.fd = -1;
+ if (g_worker->state >= BW_ST_CONN_CLIENT_MAPPED) {
+ struct slot_mapping *slmap;
+ slmap = slotmap_by_client(g_worker->bankd->slotmaps, &g_worker->client.clslot);
+ if (slmap) {
+ slotmap_del(g_bankd->slotmaps, slmap);
+ g_worker->slot.bank_id = 0xffff;
+ g_worker->slot.slot_nr = 0xffff;
+ worker_set_state(g_worker, BW_ST_CONN_CLIENT_UNMAPPED, true);
+ }
+ }
g_worker->client.clslot.client_id = g_worker->client.clslot.slot_nr = 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/42645?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I2fd03490e2506c55104309a0ef952389119023b8
Gerrit-Change-Number: 42645
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/42643?usp=email )
Change subject: ansible: openjdk: add mkdir ~/jenkins
......................................................................
ansible: openjdk: add mkdir ~/jenkins
Ensure the JDK can always be installed to /home/{{ jenkins_user
}}/jenkins/jdk/bin/java, even if ~/jenkins does not exist yet at this
point. This could be because jenkins didn't connect to the node yet, or
because the jenkins dir isn't set to ~/jenkins.
Related: OS#6998#note-4
Change-Id: I384398e2fe45988eaac32d61095c989914699245
---
M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
index f8009bb..16cc6ab 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
@@ -27,6 +27,7 @@
become: true
become_user: "{{ jenkins_user }}"
shell: |
+ mkdir -p ~/jenkins
cd ~/jenkins
case "$(arch)" in
x86_64)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42643?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I384398e2fe45988eaac32d61095c989914699245
Gerrit-Change-Number: 42643
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>