<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16623">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remsim-client: Fix the -k/ --keep-running option<br><br>When introducing asynchronous USB support in Change-Id<br>Ic18690b3c2cbc5e99de0665c0b68b7555433b3cd, we accidentially<br>broke the --keep-running behavior, where even a disappearing USB<br>device will not terminate the remsim-client process.<br><br>Change-Id: I67a3a5941434f09f7099c2cdb19c126cea305a73<br>---<br>M src/simtrace2-remsim_client.c<br>1 file changed, 14 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/23/16623/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c</span><br><span>index ac78dd4..1af3274 100644</span><br><span>--- a/src/simtrace2-remsim_client.c</span><br><span>+++ b/src/simtrace2-remsim_client.c</span><br><span>@@ -96,6 +96,9 @@</span><br><span> void __thread *talloc_asn1_ctx;</span><br><span> int asn_debug;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* should we leave main loop processing? */</span><br><span style="color: hsl(120, 100%, 40%);">+bool g_leave_main = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> __attribute__((unused)) static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len)</span><br><span> {</span><br><span>  struct gsmtap_hdr *gh;</span><br><span>@@ -152,10 +155,11 @@</span><br><span>               break;</span><br><span>       case LIBUSB_TRANSFER_NO_DEVICE:</span><br><span>              fprintf(stderr, "USB device disappeared\n");</span><br><span style="color: hsl(0, 100%, 40%);">-          exit(23);</span><br><span style="color: hsl(120, 100%, 40%);">+             g_leave_main = true;</span><br><span>                 break;</span><br><span>       default:</span><br><span style="color: hsl(0, 100%, 40%);">-                osmo_panic("USB OUT transfer failed, status=%u\n", xfer->status);</span><br><span style="color: hsl(120, 100%, 40%);">+                fprintf(stderr, "USB OUT transfer failed, status=%u\n", xfer->status);</span><br><span style="color: hsl(120, 100%, 40%);">+           g_leave_main = true;</span><br><span>                 break;</span><br><span>       }</span><br><span> </span><br><span>@@ -577,10 +581,11 @@</span><br><span>                break;</span><br><span>       case LIBUSB_TRANSFER_NO_DEVICE:</span><br><span>              fprintf(stderr, "USB device disappeared\n");</span><br><span style="color: hsl(0, 100%, 40%);">-          exit(23);</span><br><span style="color: hsl(120, 100%, 40%);">+             g_leave_main = true;</span><br><span>                 break;</span><br><span>       default:</span><br><span style="color: hsl(0, 100%, 40%);">-                osmo_panic("USB IN transfer failed, status=%u\n", xfer->status);</span><br><span style="color: hsl(120, 100%, 40%);">+         fprintf(stderr, "USB IN transfer failed, status=%u\n", xfer->status);</span><br><span style="color: hsl(120, 100%, 40%);">+            g_leave_main = true;</span><br><span>                 break;</span><br><span>       }</span><br><span> </span><br><span>@@ -627,10 +632,11 @@</span><br><span>                break;</span><br><span>       case LIBUSB_TRANSFER_NO_DEVICE:</span><br><span>              fprintf(stderr, "USB device disappeared\n");</span><br><span style="color: hsl(0, 100%, 40%);">-          exit(23);</span><br><span style="color: hsl(120, 100%, 40%);">+             g_leave_main = true;</span><br><span>                 break;</span><br><span>       default:</span><br><span style="color: hsl(0, 100%, 40%);">-                osmo_panic("USB IRQ transfer failed, status=%u\n", xfer->status);</span><br><span style="color: hsl(120, 100%, 40%);">+                fprintf(stderr, "USB IRQ transfer failed, status=%u\n", xfer->status);</span><br><span style="color: hsl(120, 100%, 40%);">+           g_leave_main = true;</span><br><span>                 break;</span><br><span>       }</span><br><span> </span><br><span>@@ -1092,9 +1098,10 @@</span><br><span>       allocate_and_submit_irq(ci);</span><br><span>         allocate_and_submit_in(ci);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+   while (!g_leave_main) {</span><br><span>              osmo_select_main(false);</span><br><span>     }</span><br><span style="color: hsl(120, 100%, 40%);">+     g_leave_main = false;</span><br><span> </span><br><span>    libusb_release_interface(transp->usb_devh, 0);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16623">change 16623</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/osmo-remsim/+/16623"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I67a3a5941434f09f7099c2cdb19c126cea305a73 </div>
<div style="display:none"> Gerrit-Change-Number: 16623 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>