<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/15927">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><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, 53 insertions(+), 4 deletions(-)<br><br></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..9e05e3c 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,18 @@</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> 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..cd98397 100644</span><br><span>--- a/utils/osmo-sim-test.c</span><br><span>+++ b/utils/osmo-sim-test.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> #include <stdlib.h></span><br><span> #include <errno.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <getopt.h></span><br><span> #include <arpa/inet.h></span><br><span> </span><br><span> #include <osmocom/core/msgb.h></span><br><span>@@ -328,6 +329,51 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void print_help(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ printf( "osmo-sim-test Usage:\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -h --help This message\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -n --reader-num NR Open reader number NR\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int readernum = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void handle_options(int argc, char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int option_index = 0, c;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct option long_options[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { "help", 0, 0, 'h' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "reader-num", 1, 0, 'n' },</span><br><span style="color: hsl(120, 100%, 40%);">+ {0,0,0,0}</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "hn:",</span><br><span style="color: hsl(120, 100%, 40%);">+ long_options, &option_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (c == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (c) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'h':</span><br><span style="color: hsl(120, 100%, 40%);">+ print_help();</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'n':</span><br><span style="color: hsl(120, 100%, 40%);">+ readernum = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(2);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argc > optind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Unsupported positional arguments on command line\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(2);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> struct osim_reader_hdl *reader;</span><br><span>@@ -335,7 +381,9 @@</span><br><span> struct osim_chan_hdl *chan;</span><br><span> struct msgb *msg;</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%);">+ handle_options(argc, argv);</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: 4 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>