<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/15927">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sim: allow opening reader# > 0<br><br>Change-Id: I4b1abc8d8aae4bd9a32f927269d7ebfef902d7c5<br>---<br>M src/sim/reader_pcsc.c<br>M utils/osmo-sim-test.c<br>2 files changed, 10 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/15927/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sim/reader_pcsc.c b/src/sim/reader_pcsc.c</span><br><span>index f22103f..853b157 100644</span><br><span>--- a/src/sim/reader_pcsc.c</span><br><span>+++ b/src/sim/reader_pcsc.c</span><br><span>@@ -79,17 +79,19 @@</span><br><span>        rc = SCardListReaders(st->hContext, NULL, (LPSTR)&mszReaders, &dwReaders);</span><br><span>        PCSC_ERROR(rc, "SCardListReaders");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     /* SCARD_S_SUCCESS means there is at least one reader in the group */</span><br><span>        num_readers = 0;</span><br><span>     ptr = mszReaders;</span><br><span style="color: hsl(0, 100%, 40%);">-       while (*ptr != '\0') {</span><br><span style="color: hsl(120, 100%, 40%);">+        while (*ptr != '\0' && num_readers != num) {</span><br><span style="color: hsl(120, 100%, 40%);">+          printf("%s\n", ptr);</span><br><span>               ptr += strlen(ptr)+1;</span><br><span>                num_readers++;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (num_readers == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (num > num_readers)</span><br><span>            goto end;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   st->name = talloc_strdup(rh, mszReaders);</span><br><span style="color: hsl(120, 100%, 40%);">+  st->name = talloc_strdup(rh, ptr);</span><br><span>        st->dwActiveProtocol = -1;</span><br><span> </span><br><span>    return rh;</span><br><span>diff --git a/utils/osmo-sim-test.c b/utils/osmo-sim-test.c</span><br><span>index 5588294..d805127 100644</span><br><span>--- a/utils/osmo-sim-test.c</span><br><span>+++ b/utils/osmo-sim-test.c</span><br><span>@@ -334,8 +334,12 @@</span><br><span>   struct osim_card_hdl *card;</span><br><span>  struct osim_chan_hdl *chan;</span><br><span>  struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+     int readernum = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  reader = osim_reader_open(OSIM_READER_DRV_PCSC, 0, "", NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+       if(argc > 1)</span><br><span style="color: hsl(120, 100%, 40%);">+               readernum = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  reader = osim_reader_open(OSIM_READER_DRV_PCSC, readernum, "", NULL);</span><br><span>      if (!reader)</span><br><span>                 exit(1);</span><br><span>     card = osim_card_open(reader, OSIM_PROTO_T0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/15927">change 15927</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/15927"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4b1abc8d8aae4bd9a32f927269d7ebfef902d7c5 </div>
<div style="display:none"> Gerrit-Change-Number: 15927 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>