<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/20939">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remove usb2udp<br><br>The UDP based forwarding really only ever was a quick hack to<br>demonstrate the capabilities.<br><br>Meanwhile, we've had the proper osmo-remsim project implemented,<br>which provides a much more reliable and comprehensive way of<br>managing SIM card emulation devices (SIMtrace2, sysmoQMOD, ...)<br>and collection of card readers (sysmoOCTSIM or any other PC/SC<br>supported readers).<br><br>Hence, remove the "UDP forwarding part.<br><br>Change-Id: Ia4b9447b95872b6e0dda6dca644f1ed4a87355a0<br>---<br>M .gitignore<br>M host/.gitignore<br>M host/contrib/simtrace2.spec.in<br>M host/src/Makefile.am<br>M host/src/simtrace2-remsim.c<br>D host/src/usb2udp.c<br>6 files changed, 41 insertions(+), 368 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index a5393d9..4920c22 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -19,7 +19,6 @@</span><br><span> *.p</span><br><span> host/simtrace2-list</span><br><span> host/simtrace2-remsim</span><br><span style="color: hsl(0, 100%, 40%);">-host/simtrace2-remsim-usb2udp</span><br><span> host/contrib/simtrace2.spec</span><br><span> usb_strings_generated.h</span><br><span> firmware/usbstring/usbstring</span><br><span>diff --git a/host/.gitignore b/host/.gitignore</span><br><span>index 13ea291..0aa1ca7 100644</span><br><span>--- a/host/.gitignore</span><br><span>+++ b/host/.gitignore</span><br><span>@@ -35,4 +35,3 @@</span><br><span> simtrace2-list</span><br><span> simtrace2-sniff</span><br><span> simtrace2-remsim</span><br><span style="color: hsl(0, 100%, 40%);">-simtrace2-remsim-usb2udp</span><br><span>diff --git a/host/contrib/simtrace2.spec.in b/host/contrib/simtrace2.spec.in</span><br><span>index e2067b1..36bf0e6 100644</span><br><span>--- a/host/contrib/simtrace2.spec.in</span><br><span>+++ b/host/contrib/simtrace2.spec.in</span><br><span>@@ -82,7 +82,6 @@</span><br><span> %files</span><br><span> %doc README.md</span><br><span> %{_bindir}/simtrace2-remsim</span><br><span style="color: hsl(0, 100%, 40%);">-%{_bindir}/simtrace2-remsim-usb2udp</span><br><span> %{_bindir}/simtrace2-list</span><br><span> %{_bindir}/simtrace2-sniff</span><br><span> %{_udevrulesdir}/99-simtrace2.rules</span><br><span>diff --git a/host/src/Makefile.am b/host/src/Makefile.am</span><br><span>index c3283ba..e9cd801 100644</span><br><span>--- a/host/src/Makefile.am</span><br><span>+++ b/host/src/Makefile.am</span><br><span>@@ -5,12 +5,10 @@</span><br><span> LDADD= $(top_builddir)/lib/libosmo-simtrace2.la \</span><br><span> $(LIBOSMOCORE_LIBS) $(LIBOSMOSIM_LIBS) $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = simtrace2-remsim simtrace2-list simtrace2-sniff</span><br><span> </span><br><span> simtrace2_remsim_SOURCES = simtrace2-remsim.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-simtrace2_remsim_usb2udp_SOURCES = usb2udp.c</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> simtrace2_list_SOURCES = simtrace2_usb.c</span><br><span> </span><br><span> simtrace2_sniff_SOURCES = simtrace2-sniff.c</span><br><span>diff --git a/host/src/simtrace2-remsim.c b/host/src/simtrace2-remsim.c</span><br><span>index 6752fc6..1c4cced 100644</span><br><span>--- a/host/src/simtrace2-remsim.c</span><br><span>+++ b/host/src/simtrace2-remsim.c</span><br><span>@@ -178,9 +178,7 @@</span><br><span> </span><br><span> static void print_help(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- printf( "\t-r\t--remote-udp-host HOST\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t-p\t--remote-udp-port PORT\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t-h\t--help\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ printf( "\t-h\t--help\n"</span><br><span> "\t-i\t--gsmtap-ip\tA.B.C.D\n"</span><br><span> "\t-a\t--skip-atr\n"</span><br><span> "\t-t\t--set-atr\tATR-STRING in HEX\n"</span><br><span>@@ -198,8 +196,6 @@</span><br><span> }</span><br><span> </span><br><span> static const struct option opts[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "remote-udp-host", 1, 0, 'r' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "remote-udp-port", 1, 0, 'p' },</span><br><span> { "gsmtap-ip", 1, 0, 'i' },</span><br><span> { "skip-atr", 0, 0, 'a' },</span><br><span> { "set-atr", 1, 0, 't' },</span><br><span>@@ -228,22 +224,13 @@</span><br><span> </span><br><span> while (1) {</span><br><span> /* read data from SIMtrace2 device (local or via USB) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (transp->udp_fd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.in,</span><br><span style="color: hsl(0, 100%, 40%);">- buf, sizeof(buf), &xfer_len, 100);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT &&</span><br><span style="color: hsl(0, 100%, 40%);">- rc != LIBUSB_ERROR_INTERRUPTED &&</span><br><span style="color: hsl(0, 100%, 40%);">- rc != LIBUSB_ERROR_IO) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "BULK IN transfer error; rc=%d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = read(transp->udp_fd, buf, sizeof(buf));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "shor read from UDP\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- xfer_len = rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.in,</span><br><span style="color: hsl(120, 100%, 40%);">+ buf, sizeof(buf), &xfer_len, 100);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT &&</span><br><span style="color: hsl(120, 100%, 40%);">+ rc != LIBUSB_ERROR_INTERRUPTED &&</span><br><span style="color: hsl(120, 100%, 40%);">+ rc != LIBUSB_ERROR_IO) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "BULK IN transfer error; rc=%d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> }</span><br><span> /* dispatch any incoming data */</span><br><span> if (xfer_len > 0) {</span><br><span>@@ -291,11 +278,9 @@</span><br><span> uint8_t real_atr[ATR_MAX_LEN];</span><br><span> int atr_len;</span><br><span> int keep_running = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int remote_udp_port = 52342;</span><br><span> int if_num = 0, vendor_id = -1, product_id = -1;</span><br><span> int config_id = -1, altsetting = 0, addr = -1;</span><br><span> int reader_num = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- char *remote_udp_host = NULL;</span><br><span> char *path = NULL;</span><br><span> struct osim_reader_hdl *reader;</span><br><span> struct osim_card_hdl *card;</span><br><span>@@ -305,16 +290,10 @@</span><br><span> while (1) {</span><br><span> int option_index = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- c = getopt_long(argc, argv, "r:p:hi:V:P:C:I:S:A:H:akn:t:", opts, &option_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "hi:V:P:C:I:S:A:H:akn:t:", opts, &option_index);</span><br><span> if (c == -1)</span><br><span> break;</span><br><span> switch (c) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 'r':</span><br><span style="color: hsl(0, 100%, 40%);">- remote_udp_host = optarg;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'p':</span><br><span style="color: hsl(0, 100%, 40%);">- remote_udp_port = atoi(optarg);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> case 'h':</span><br><span> print_help();</span><br><span> exit(0);</span><br><span>@@ -365,29 +344,17 @@</span><br><span> goto do_exit;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!remote_udp_host && (vendor_id < 0 || product_id < 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vendor_id < 0 || product_id < 0) {</span><br><span> fprintf(stderr, "You have to specify the vendor and product ID\n");</span><br><span> goto do_exit;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- transp->udp_fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> ci->card_prof = &osim_uicc_sim_cic_profile;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!remote_udp_host) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = libusb_init(NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "libusb initialization failed\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto do_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- transp->udp_fd = osmo_sock_init(AF_INET, SOCK_DGRAM, IPPROTO_UDP,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_udp_host, remote_udp_port+if_num,</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_SOCK_F_CONNECT);</span><br><span style="color: hsl(0, 100%, 40%);">- if (transp->udp_fd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "error binding UDP port\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto do_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = libusb_init(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "libusb initialization failed\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ goto do_exit;</span><br><span> }</span><br><span> </span><br><span> rc = osmo_st2_gsmtap_init(gsmtap_host);</span><br><span>@@ -417,34 +384,32 @@</span><br><span> signal(SIGINT, &signal_handler);</span><br><span> </span><br><span> do {</span><br><span style="color: hsl(0, 100%, 40%);">- if (transp->udp_fd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct usb_interface_match _ifm, *ifm = &_ifm;</span><br><span style="color: hsl(0, 100%, 40%);">- ifm->vendor = vendor_id;</span><br><span style="color: hsl(0, 100%, 40%);">- ifm->product = product_id;</span><br><span style="color: hsl(0, 100%, 40%);">- ifm->configuration = config_id;</span><br><span style="color: hsl(0, 100%, 40%);">- ifm->interface = if_num;</span><br><span style="color: hsl(0, 100%, 40%);">- ifm->altsetting = altsetting;</span><br><span style="color: hsl(0, 100%, 40%);">- ifm->addr = addr;</span><br><span style="color: hsl(0, 100%, 40%);">- if (path)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_strlcpy(ifm->path, path, sizeof(ifm->path));</span><br><span style="color: hsl(0, 100%, 40%);">- transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!transp->usb_devh) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "can't open USB device\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto close_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ struct usb_interface_match _ifm, *ifm = &_ifm;</span><br><span style="color: hsl(120, 100%, 40%);">+ ifm->vendor = vendor_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ ifm->product = product_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ ifm->configuration = config_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ ifm->interface = if_num;</span><br><span style="color: hsl(120, 100%, 40%);">+ ifm->altsetting = altsetting;</span><br><span style="color: hsl(120, 100%, 40%);">+ ifm->addr = addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (path)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(ifm->path, path, sizeof(ifm->path));</span><br><span style="color: hsl(120, 100%, 40%);">+ transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!transp->usb_devh) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "can't open USB device\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ goto close_exit;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = libusb_claim_interface(transp->usb_devh, if_num);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "can't claim interface %d; rc=%d\n", if_num, rc);</span><br><span style="color: hsl(0, 100%, 40%);">- goto close_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = libusb_claim_interface(transp->usb_devh, if_num);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "can't claim interface %d; rc=%d\n", if_num, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto close_exit;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_libusb_get_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out,</span><br><span style="color: hsl(0, 100%, 40%);">- &transp->usb_ep.in, &transp->usb_ep.irq_in);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- goto close_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_libusb_get_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out,</span><br><span style="color: hsl(120, 100%, 40%);">+ &transp->usb_ep.in, &transp->usb_ep.irq_in);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto close_exit;</span><br><span> }</span><br><span> </span><br><span> /* simulate card-insert to modem (owhw, not qmod) */</span><br><span>@@ -465,8 +430,7 @@</span><br><span> run_mainloop(ci);</span><br><span> ret = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (transp->udp_fd < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- libusb_release_interface(transp->usb_devh, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ libusb_release_interface(transp->usb_devh, 0);</span><br><span> close_exit:</span><br><span> if (transp->usb_devh)</span><br><span> libusb_close(transp->usb_devh);</span><br><span>@@ -474,8 +438,7 @@</span><br><span> sleep(1);</span><br><span> } while (keep_running);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (transp->udp_fd < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- libusb_exit(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ libusb_exit(NULL);</span><br><span> do_exit:</span><br><span> return ret;</span><br><span> }</span><br><span>diff --git a/host/src/usb2udp.c b/host/src/usb2udp.c</span><br><span>deleted file mode 100644</span><br><span>index 2c07a3a..0000000</span><br><span>--- a/host/src/usb2udp.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,285 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* simtrace - main program for the host PC</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2010-2016 by Harald Welte <hwelte@hmw-consulting.de></span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or</span><br><span style="color: hsl(0, 100%, 40%);">- * modify it under the terms of the GNU General Public License</span><br><span style="color: hsl(0, 100%, 40%);">- * as published by the Free Software Foundation; either version 2</span><br><span style="color: hsl(0, 100%, 40%);">- * of the License, or (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * You should have received a copy of the GNU General Public License</span><br><span style="color: hsl(0, 100%, 40%);">- * along with this program; if not, write to the Free Software</span><br><span style="color: hsl(0, 100%, 40%);">- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-#include <errno.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdio.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdlib.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <string.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdint.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <time.h></span><br><span style="color: hsl(0, 100%, 40%);">-#define _GNU_SOURCE</span><br><span style="color: hsl(0, 100%, 40%);">-#include <getopt.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <poll.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/time.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/types.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/socket.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <netinet/in.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <arpa/inet.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <libusb.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/usb/libusb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/simtrace2/simtrace_usb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/simtrace2/simtrace_prot.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/utils.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/socket.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/select.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct libusb_device_handle *g_devh;</span><br><span style="color: hsl(0, 100%, 40%);">-static struct sockaddr_in g_sa_remote;</span><br><span style="color: hsl(0, 100%, 40%);">-static struct osmo_fd g_udp_ofd;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void print_welcome(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- printf("usb2udp - UDP/IP forwarding of SIMtrace card emulation\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "(C) 2016 by Harald Welte <laforge@gnumonks.org>\n\n");</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void print_help(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- printf( "\t-h\t--help\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t-i\t--interface <0-255>\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "\n"</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct ep_buf {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ep;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf[1024];</span><br><span style="color: hsl(0, 100%, 40%);">- struct libusb_transfer *xfer;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-static struct ep_buf g_buf_in;</span><br><span style="color: hsl(0, 100%, 40%);">-static struct ep_buf g_buf_out;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void usb_in_xfer_cb(struct libusb_transfer *xfer)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("xfer_cb(ep=%02x): status=%d, flags=0x%x, type=%u, len=%u, act_len=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- xfer->endpoint, xfer->status, xfer->flags, xfer->type, xfer->length, xfer->actual_length);</span><br><span style="color: hsl(0, 100%, 40%);">- switch (xfer->status) {</span><br><span style="color: hsl(0, 100%, 40%);">- case LIBUSB_TRANSFER_COMPLETED:</span><br><span style="color: hsl(0, 100%, 40%);">- if (xfer->endpoint == g_buf_in.ep) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* process the data */</span><br><span style="color: hsl(0, 100%, 40%);">- printf("read %d bytes from SIMTRACE, forwarding to UDP\n", xfer->actual_length);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = sendto(g_udp_ofd.fd, xfer->buffer, xfer->actual_length, 0, (struct sockaddr *)&g_sa_remote, sizeof(g_sa_remote));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "error writing to UDP\n");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* and re-submit the URB */</span><br><span style="color: hsl(0, 100%, 40%);">- libusb_submit_transfer(xfer);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (xfer->endpoint == g_buf_out.ep) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* re-enable reading from the UDP side */</span><br><span style="color: hsl(0, 100%, 40%);">- g_udp_ofd.when |= OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "xfer_cb(ERROR '%s')\n", osmo_hexdump_nospc(xfer->buffer, xfer->actual_length));</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void init_ep_buf(struct ep_buf *epb)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (!epb->xfer)</span><br><span style="color: hsl(0, 100%, 40%);">- epb->xfer = libusb_alloc_transfer(0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- epb->xfer->flags = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- libusb_fill_bulk_transfer(epb->xfer, g_devh, epb->ep, epb->buf, sizeof(epb->buf), usb_in_xfer_cb, NULL, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/***********************************************************************</span><br><span style="color: hsl(0, 100%, 40%);">- * libosmocore main loop integration of libusb async I/O</span><br><span style="color: hsl(0, 100%, 40%);">- ***********************************************************************/</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int g_libusb_pending = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int ofd_libusb_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">- g_libusb_pending = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* call-back when libusb adds a FD */</span><br><span style="color: hsl(0, 100%, 40%);">-static void libusb_fd_added_cb(int fd, short events, void *user_data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd *ofd = talloc_zero(NULL, struct osmo_fd);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s(%u, %x)\n", __func__, fd, events);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->cb = &ofd_libusb_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- if (events & POLLIN)</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when |= OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- if (events & POLLOUT)</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_register(ofd);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* call-back when libusb removes a FD */</span><br><span style="color: hsl(0, 100%, 40%);">-static void libusb_fd_removed_cb(int fd, void *user_data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s(%u)\n", __func__, fd);</span><br><span style="color: hsl(0, 100%, 40%);">-#if 0</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd *ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: This needs new export in libosmocore! */</span><br><span style="color: hsl(0, 100%, 40%);">- ofd = osmo_fd_get_by_fd(fd);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ofd) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_unregister(ofd);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ofd);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* call-back when the UDP socket is readable */</span><br><span style="color: hsl(0, 100%, 40%);">-static int ofd_udp_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- socklen_t addrlen = sizeof(g_sa_remote);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = recvfrom(ofd->fd, g_buf_out.buf, sizeof(g_buf_out.buf), 0,</span><br><span style="color: hsl(0, 100%, 40%);">- (struct sockaddr *)&g_sa_remote, &addrlen);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "error reading from UDP\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- printf("read %d bytes from UDP, forwarding to SIMTRACE\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- g_buf_out.xfer->length = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* disable further READ interest for the UDP socket */</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when &= ~OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* submit the URB on the OUT end point */</span><br><span style="color: hsl(0, 100%, 40%);">- libusb_submit_transfer(g_buf_out.xfer);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void run_mainloop(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Entering main loop\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_select_main(0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_libusb_pending) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct timeval tv;</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&tv, 0, sizeof(tv));</span><br><span style="color: hsl(0, 100%, 40%);">- rc = libusb_handle_events_timeout_completed(NULL, &tv, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "handle_events_timeout_completed == %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int main(int argc, char **argv)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- int c, ret = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- int local_udp_port = 52342;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int if_num = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- print_welcome();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {</span><br><span style="color: hsl(0, 100%, 40%);">- int option_index = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- static const struct option opts[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "udp-port", 1, 0, 'u' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "interface", 1, 0, 'I' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "help", 0, 0, 'h' },</span><br><span style="color: hsl(0, 100%, 40%);">- { NULL, 0, 0, 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- c = getopt_long(argc, argv, "u:I:h", opts, &option_index);</span><br><span style="color: hsl(0, 100%, 40%);">- if (c == -1)</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- switch (c) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 'u':</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port = atoi(optarg);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'I':</span><br><span style="color: hsl(0, 100%, 40%);">- if_num = atoi(optarg);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'h':</span><br><span style="color: hsl(0, 100%, 40%);">- print_help();</span><br><span style="color: hsl(0, 100%, 40%);">- exit(0);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = libusb_init(NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "libusb initialization failed\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto close_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- libusb_set_pollfd_notifiers(NULL, &libusb_fd_added_cb, &libusb_fd_removed_cb, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- g_devh = libusb_open_device_with_vid_pid(NULL, USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!g_devh) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "can't open USB device\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto close_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = libusb_claim_interface(g_devh, if_num);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "can't claim interface %u; rc=%d\n", if_num, rc);</span><br><span style="color: hsl(0, 100%, 40%);">- goto close_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* open UDP socket, register with select handling and mark it</span><br><span style="color: hsl(0, 100%, 40%);">- * readable */</span><br><span style="color: hsl(0, 100%, 40%);">- g_udp_ofd.cb = ofd_udp_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sock_init_ofd(&g_udp_ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, local_udp_port + if_num, OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_libusb_get_ep_addrs(g_devh, if_num, &g_buf_out.ep, &g_buf_in.ep, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "couldn't find enpdoint addresses; rc=%d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- goto close_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* initialize USB buffers / transfers */</span><br><span style="color: hsl(0, 100%, 40%);">- init_ep_buf(&g_buf_out);</span><br><span style="color: hsl(0, 100%, 40%);">- init_ep_buf(&g_buf_in);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* submit the first transfer for the IN endpoint */</span><br><span style="color: hsl(0, 100%, 40%);">- libusb_submit_transfer(g_buf_in.xfer);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- run_mainloop();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ret = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- libusb_release_interface(g_devh, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-close_exit:</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_devh)</span><br><span style="color: hsl(0, 100%, 40%);">- libusb_close(g_devh);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- libusb_exit(NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/20939">change 20939</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/simtrace2/+/20939"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia4b9447b95872b6e0dda6dca644f1ed4a87355a0 </div>
<div style="display:none"> Gerrit-Change-Number: 20939 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>