<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13498">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename executables to include osmo- name prefix<br><br>Change-Id: I4498a004519499cc4b897a68c7f33efe29a63425<br>---<br>M doc/manuals/chapters/remsim-bankd.adoc<br>M doc/manuals/chapters/remsim-client.adoc<br>M doc/manuals/chapters/remsim-server.adoc<br>M src/Makefile.am<br>M src/server/Makefile.am<br>5 files changed, 86 insertions(+), 82 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/98/13498/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/remsim-bankd.adoc b/doc/manuals/chapters/remsim-bankd.adoc</span><br><span>index 7e83621..317abf4 100644</span><br><span>--- a/doc/manuals/chapters/remsim-bankd.adoc</span><br><span>+++ b/doc/manuals/chapters/remsim-bankd.adoc</span><br><span>@@ -1,18 +1,18 @@</span><br><span style="color: hsl(0, 100%, 40%);">-== remsim-bankd</span><br><span style="color: hsl(120, 100%, 40%);">+== osmo-remsim-bankd</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-The `remsim-bankd` (SIM Bank Daemon) manages one given SIM bank. The</span><br><span style="color: hsl(0, 100%, 40%);">-initial implementation supports a PC/SC driver to expose any PC/SC</span><br><span style="color: hsl(120, 100%, 40%);">+The `osmo-remsim-bankd` (SIM Bank Daemon) manages one given SIM bank.</span><br><span style="color: hsl(120, 100%, 40%);">+The initial implementation supports a PC/SC driver to expose any PC/SC</span><br><span> compatible card readers as SIM bank.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-`remsim-bankd` initially connects via a RSPRO control connection to</span><br><span style="color: hsl(0, 100%, 40%);">-`remsim-server` at startup, and will in turn receive a set of initial</span><br><span style="color: hsl(0, 100%, 40%);">-[client,slot]:[bankd,slot] mappings. These mappings determine which</span><br><span style="color: hsl(0, 100%, 40%);">-slot on the client (corresponding to a modem) is mapped to which slot on</span><br><span style="color: hsl(0, 100%, 40%);">-the SIM bank. Mappings can be updated by `remsim-server` at any given</span><br><span style="color: hsl(0, 100%, 40%);">-point in time.</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-bankd` initially connects via a RSPRO control connection to</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-server` at startup, and will in turn receive a set of</span><br><span style="color: hsl(120, 100%, 40%);">+initial [client,slot]:[bankd,slot] mappings. These mappings determine</span><br><span style="color: hsl(120, 100%, 40%);">+which slot on the client (corresponding to a modem) is mapped to which</span><br><span style="color: hsl(120, 100%, 40%);">+slot on the SIM bank. Mappings can be updated by `osmo-remsim-server`</span><br><span style="color: hsl(120, 100%, 40%);">+at any given point in time.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-`remsim-bankd` implements a RSPRO server, where it listens to connections</span><br><span style="color: hsl(0, 100%, 40%);">-from `remsim-clients`.</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-bankd` implements a RSPRO server, where it listens to</span><br><span style="color: hsl(120, 100%, 40%);">+connections from `osmo-remsim-clients`.</span><br><span> </span><br><span> As PC/SC only offers a blocking API, there is one thread per PC/SC slot.</span><br><span> This thread will perform blocking I/O on the socket towards the client,</span><br><span>@@ -32,10 +32,10 @@</span><br><span> client has identified itself. The advantage is that the entire bankd</span><br><span> can live without any non-blocking I/O.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-The main thread handles the connection to `remsim-server`, where it can</span><br><span style="color: hsl(0, 100%, 40%);">-also use non-blocking I/O. However, re-connection would be required, to</span><br><span style="color: hsl(0, 100%, 40%);">-avoid stalling all banks/cards in the event of a connection loss to the</span><br><span style="color: hsl(0, 100%, 40%);">-server.</span><br><span style="color: hsl(120, 100%, 40%);">+The main thread handles the connection to `osmo-remsim-server`, where it</span><br><span style="color: hsl(120, 100%, 40%);">+can also use non-blocking I/O. However, re-connection would be</span><br><span style="color: hsl(120, 100%, 40%);">+required, to avoid stalling all banks/cards in the event of a connection</span><br><span style="color: hsl(120, 100%, 40%);">+loss to the server.</span><br><span> </span><br><span> worker threads have the following states:</span><br><span> * INIT (just started)</span><br><span>@@ -56,39 +56,40 @@</span><br><span> </span><br><span> === Running</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-`remsim-bankd` currently has the following command-line options:</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-bankd` currently has the following command-line options:</span><br><span> </span><br><span> ==== SYNOPSIS</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-*remsim-bankd* [-h] [-i A.B.C.D] [-p <1-65535>] [-b <1-65535>] [-n <1-65535>] [-I A.B.C.D] [-P <1-65535> ]</span><br><span style="color: hsl(120, 100%, 40%);">+*osmo-remsim-bankd* [-h] [-i A.B.C.D] [-p <1-65535>] [-b <1-65535>] [-n <1-65535>] [-I A.B.C.D] [-P <1-65535> ]</span><br><span> </span><br><span> ==== OPTIONS</span><br><span> </span><br><span> *-h, --help*::</span><br><span> Print a short help message about the supported options</span><br><span> *-i, --server-host A.B.C.D*::</span><br><span style="color: hsl(0, 100%, 40%);">- Specify the remote IP address/hostname of the remsim-server to which this bankd</span><br><span style="color: hsl(0, 100%, 40%);">- shall establish its RSPRO control connection</span><br><span style="color: hsl(120, 100%, 40%);">+ Specify the remote IP address/hostname of the `osmo-remsim-server` to</span><br><span style="color: hsl(120, 100%, 40%);">+ which this bankd shall establish its RSPRO control connection</span><br><span> *-p, --server-port <1-65535>*::</span><br><span style="color: hsl(0, 100%, 40%);">- Specify the remote TCP port number of the remsim-server to whihc this bankd</span><br><span style="color: hsl(0, 100%, 40%);">- shall establish its RSPRO control connection</span><br><span style="color: hsl(120, 100%, 40%);">+ Specify the remote TCP port number of the `osmo-remsim-server` to which</span><br><span style="color: hsl(120, 100%, 40%);">+ this bankd shall establish its RSPRO control connection</span><br><span> *-b, --bank-id <1-65535>*::</span><br><span style="color: hsl(0, 100%, 40%);">- Specify the numeric bank identifier of the SIM bank this bankd instance</span><br><span style="color: hsl(0, 100%, 40%);">- operates. Must be unique among all banks connecting to the same remsim-server.</span><br><span style="color: hsl(120, 100%, 40%);">+ Specify the numeric bank identifier of the SIM bank this bankd</span><br><span style="color: hsl(120, 100%, 40%);">+ instance operates. Must be unique among all banks connecting to the</span><br><span style="color: hsl(120, 100%, 40%);">+ same `osmo-remsim-server`.</span><br><span> *-n, --num-slots <1-65535>*::</span><br><span> Specify the number of slots that this bankd handles.</span><br><span> *-I, --bind-IP A.B.C.D*::</span><br><span> Specify the local IP address to which the socket for incoming connections</span><br><span style="color: hsl(0, 100%, 40%);">- from remsim-clients is bound to.</span><br><span style="color: hsl(120, 100%, 40%);">+ from `osmo-remsim-clients` is bound to.</span><br><span> *-P, --bind-port <1-65535>*::</span><br><span> Specify the local TCP port to whicc the socket for incoming connections</span><br><span style="color: hsl(0, 100%, 40%);">- from remsim-clients is bound to.</span><br><span style="color: hsl(120, 100%, 40%);">+ from `osmo-remsim-client`s is bound to.</span><br><span> </span><br><span> === Logging</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-remsim-bankd currently logs to stdout only, and the logging verbosity</span><br><span style="color: hsl(0, 100%, 40%);">-is not yet configurable. However, as the libosmocore logging framework</span><br><span style="color: hsl(0, 100%, 40%);">-is used, extending this is an easy modification.</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-bankd` currently logs to stdout only, and the logging</span><br><span style="color: hsl(120, 100%, 40%);">+verbosity is not yet configurable. However, as the libosmocore logging</span><br><span style="color: hsl(120, 100%, 40%);">+framework is used, extending this is an easy modification.</span><br><span> </span><br><span> === `bankd_pcsc_slots.csv` CSV file</span><br><span> </span><br><span>diff --git a/doc/manuals/chapters/remsim-client.adoc b/doc/manuals/chapters/remsim-client.adoc</span><br><span>index 2b67bf0..0526dbb 100644</span><br><span>--- a/doc/manuals/chapters/remsim-client.adoc</span><br><span>+++ b/doc/manuals/chapters/remsim-client.adoc</span><br><span>@@ -1,18 +1,19 @@</span><br><span style="color: hsl(0, 100%, 40%);">-== simtrace2-remsim-client</span><br><span style="color: hsl(120, 100%, 40%);">+== osmo-remsim-client-st2</span><br><span> </span><br><span> The client interfaces with GSM phones / modems via dedicated "Card</span><br><span> Emulation" devices such as the Osmocom SIMtrace2 or sysmocom sysmoQMOD</span><br><span> board + firmware. This hardware implements the ISO7816-3 electrical</span><br><span> interface and protocol handling and passes any TPDU headers received</span><br><span style="color: hsl(0, 100%, 40%);">-from the phone/modem to `remsim-client` for further processing of the</span><br><span style="color: hsl(0, 100%, 40%);">-TPDUs associated to the given APDU transfer.</span><br><span style="color: hsl(120, 100%, 40%);">+from the phone/modem to `osmo-remsim-client` for further processing of</span><br><span style="color: hsl(120, 100%, 40%);">+the TPDUs associated to the given APDU transfer.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-`remsim-client` connects via a RSPRO control connection to remsim-server</span><br><span style="color: hsl(0, 100%, 40%);">-at startup and registers itself. It will receive configuration data</span><br><span style="color: hsl(0, 100%, 40%);">-such as the `remsim-bankd` IP+Port and the ClientId from remsim-server.</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-client` connects via a RSPRO control connection to</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-server` at startup and registers itself. It will receive</span><br><span style="color: hsl(120, 100%, 40%);">+configuration data such as the `osmo-remsim-bankd` IP+Port and the</span><br><span style="color: hsl(120, 100%, 40%);">+ClientId from `osmo-remsim-server`.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-After receiving the configuration, `remsim-client` will establish a RSPRO</span><br><span style="color: hsl(0, 100%, 40%);">-data connection to the `remsim-bankd` IP:Port.</span><br><span style="color: hsl(120, 100%, 40%);">+After receiving the configuration, `osmo-remsim-client` will establish a</span><br><span style="color: hsl(120, 100%, 40%);">+RSPRO data connection to the `osmo-remsim-bankd` IP:Port.</span><br><span> </span><br><span> As the USB interface for remote SIM in simtrace2.git uses one interface</span><br><span> per slot, we can implement the client in blocking mode, i.e. use</span><br><span>@@ -21,35 +22,35 @@</span><br><span> </span><br><span> === Running</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-simtrace2-remsim-client currently has the following command-line options:</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-remsim-client-st2 currently has the following command-line options:</span><br><span> </span><br><span> ==== SYNOPSIS</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-*simtrace2-remsim-client* [...]</span><br><span style="color: hsl(120, 100%, 40%);">+*osmo-remsim-client-st2* [...]</span><br><span> </span><br><span> ==== OPTIONS</span><br><span> </span><br><span> *-h, --help*::</span><br><span> Print a short help message about the supported options</span><br><span> *-s, --server-host A.B.C.D*::</span><br><span style="color: hsl(0, 100%, 40%);">- Specify the remote IP address / hostname of the remsim-server to which</span><br><span style="color: hsl(0, 100%, 40%);">- this client shall establish its RSPRO control connection</span><br><span style="color: hsl(120, 100%, 40%);">+ Specify the remote IP address / hostname of the `osmo-remsim-server` to</span><br><span style="color: hsl(120, 100%, 40%);">+ which this client shall establish its RSPRO control connection</span><br><span> *-p, --server-port <1-65535>*::</span><br><span style="color: hsl(0, 100%, 40%);">- Specify the remote TCP port number of the remsim-server to which this client</span><br><span style="color: hsl(0, 100%, 40%);">- shall establish its RSPRO control connection</span><br><span style="color: hsl(120, 100%, 40%);">+ Specify the remote TCP port number of the `osmo-remsim-server` to which</span><br><span style="color: hsl(120, 100%, 40%);">+ this client shall establish its RSPRO control connection</span><br><span> *-c, --client-id <1-65535>*::</span><br><span> Specify the numeric client identifier of the SIM bank this bankd</span><br><span style="color: hsl(0, 100%, 40%);">- instance operates. The tuple of client-id and client-slot must be unique</span><br><span style="color: hsl(0, 100%, 40%);">- among all clients connecting to the same remsim-server.</span><br><span style="color: hsl(120, 100%, 40%);">+ instance operates. The tuple of client-id and client-slot must be</span><br><span style="color: hsl(120, 100%, 40%);">+ unique among all clients connecting to the same `osmo-remsim-server`.</span><br><span> *-n, --client-slot <0-65535>*::</span><br><span> Specify the slot number served within this client. The tuple of</span><br><span> client-id and client-slot must be unique among all clients connecting</span><br><span style="color: hsl(0, 100%, 40%);">- to the same remsim-server.</span><br><span style="color: hsl(120, 100%, 40%);">+ to the same `osmo-remsim-server`.</span><br><span> *-i, --gsmtap-ip A.B.C.D*::</span><br><span> Specify the IP address (if any) to which APDU traces are sent in</span><br><span> GSMTAP format (useful for debugging; supported by wireshark).</span><br><span> *-k, --keep-running*::</span><br><span style="color: hsl(0, 100%, 40%);">- Specify if the remsim-client should terminate after handling one</span><br><span style="color: hsl(120, 100%, 40%);">+ Specify if the `osmo-remsim-client` should terminate after handling one</span><br><span> session, or whether it should keep running. Fast respawn (i.e. no</span><br><span> --keep-running) is probably the more robust option at this point.</span><br><span> *-V, --usb-vendor*::</span><br><span>@@ -79,11 +80,11 @@</span><br><span> SIM emulation device attached to your system.</span><br><span> *-a, --atr HEXSTRING*::</span><br><span> Specify the initial ATR to be communicated to the modem/phone. Can</span><br><span style="color: hsl(0, 100%, 40%);">- and will later be overridden by the ATR as specified by remsim-bankd</span><br><span style="color: hsl(0, 100%, 40%);">- once a card has been mapped to this client.</span><br><span style="color: hsl(120, 100%, 40%);">+ and will later be overridden by the ATR as specified by</span><br><span style="color: hsl(120, 100%, 40%);">+ `osmo-remsim-bankd` once a card has been mapped to this client.</span><br><span> </span><br><span> === Logging</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-remsim-client currently logs to stdout only, and the logging verbosity</span><br><span style="color: hsl(0, 100%, 40%);">-is not yet configurable. However, as the libosmocore logging framework</span><br><span style="color: hsl(0, 100%, 40%);">-is used, extending this is an easy modification.</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-client` currently logs to stdout only, and the logging</span><br><span style="color: hsl(120, 100%, 40%);">+verbosity is not yet configurable. However, as the libosmocore logging</span><br><span style="color: hsl(120, 100%, 40%);">+framework is used, extending this is an easy modification.</span><br><span>diff --git a/doc/manuals/chapters/remsim-server.adoc b/doc/manuals/chapters/remsim-server.adoc</span><br><span>index fcb7283..e5ab58d 100644</span><br><span>--- a/doc/manuals/chapters/remsim-server.adoc</span><br><span>+++ b/doc/manuals/chapters/remsim-server.adoc</span><br><span>@@ -1,12 +1,12 @@</span><br><span style="color: hsl(0, 100%, 40%);">-== remsim-server</span><br><span style="color: hsl(120, 100%, 40%);">+== osmo-remsim-server</span><br><span> </span><br><span> === Running</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-`remsim-server` currently has no command-line arguments. It will bind to</span><br><span style="color: hsl(0, 100%, 40%);">-INADDR_ANY and offer the following TCP ports:</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-server` currently has no command-line arguments. It will</span><br><span style="color: hsl(120, 100%, 40%);">+bind to INADDR_ANY and offer the following TCP ports:</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-* Port 9998 for the inbound control connections from `remsim-client`</span><br><span style="color: hsl(0, 100%, 40%);">- and `remsim-bankd`</span><br><span style="color: hsl(120, 100%, 40%);">+* Port 9998 for the inbound control connections from `osmo-remsim-client`</span><br><span style="color: hsl(120, 100%, 40%);">+ and `osmo-remsim-bankd`</span><br><span> * Port 9997 for the RESTful/JSON Web API (role: HTTP server)</span><br><span> </span><br><span> It is intended to make these settings (IP addresses, ports) configurable</span><br><span>@@ -14,13 +14,13 @@</span><br><span> </span><br><span> === Logging</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-`remsim-server` currently logs to stdout only, and the logging verbosity</span><br><span style="color: hsl(0, 100%, 40%);">-is not yet configurable. However, as the libosmocore logging framework</span><br><span style="color: hsl(0, 100%, 40%);">-is used, extending this is an easy modification.</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-server` currently logs to stdout only, and the logging</span><br><span style="color: hsl(120, 100%, 40%);">+verbosity is not yet configurable. However, as the libosmocore logging</span><br><span style="color: hsl(120, 100%, 40%);">+framework is used, extending this is an easy modification.</span><br><span> </span><br><span> === RESTful/JSON Web API</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-`remsim-server` provides a RESTful/JSON WEB API for application logic</span><br><span style="color: hsl(120, 100%, 40%);">+`osmo-remsim-server` provides a RESTful/JSON WEB API for application logic</span><br><span> integration. The purpose of the API is to allow run-time configuration</span><br><span> and monitoring of the entire osmo-remsim system.</span><br><span> </span><br><span>@@ -29,28 +29,28 @@</span><br><span> ==== /api/backend/v1/clients</span><br><span> </span><br><span> *GET* obtains a JSON list where each element represents one currently</span><br><span style="color: hsl(0, 100%, 40%);">-connected `remsim-client`.</span><br><span style="color: hsl(120, 100%, 40%);">+connected `osmo-remsim-client`.</span><br><span> </span><br><span> No other HTTP operation is implemented.</span><br><span> </span><br><span> ==== /api/backend/v1/clients/:client_id</span><br><span> </span><br><span> *GET* obtains a single JSON object representing one specific currently</span><br><span style="color: hsl(0, 100%, 40%);">-connected `remsim-client`.</span><br><span style="color: hsl(120, 100%, 40%);">+connected `osmo-remsim-client`.</span><br><span> </span><br><span> No other HTTP operation is implemented.</span><br><span> </span><br><span> ==== /api/backend/v1/bankds</span><br><span> </span><br><span> *GET* obtains a JSON list where each element represents one currently</span><br><span style="color: hsl(0, 100%, 40%);">-connected `remsim-bankd`.</span><br><span style="color: hsl(120, 100%, 40%);">+connected `osmo-remsim-bankd`.</span><br><span> </span><br><span> No other HTTP operation is implemented.</span><br><span> </span><br><span> ==== /api/backend/v1/bankds/:bank_id</span><br><span> </span><br><span> *GET* obtains a single JSON object representing one specific currently</span><br><span style="color: hsl(0, 100%, 40%);">-connected `remsim-bankd`.</span><br><span style="color: hsl(120, 100%, 40%);">+connected `osmo-remsim-bankd`.</span><br><span> </span><br><span> No other HTTP operation is implemented.</span><br><span> </span><br><span>@@ -74,5 +74,5 @@</span><br><span> </span><br><span> ==== /api/backend/v1/global-reset</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-*POST* performs a global reset of the `remsim-server` state. This means</span><br><span style="color: hsl(0, 100%, 40%);">-all mappings are removed.</span><br><span style="color: hsl(120, 100%, 40%);">+*POST* performs a global reset of the `osmo-remsim-server` state. This</span><br><span style="color: hsl(120, 100%, 40%);">+means all mappings are removed.</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index ab77375..d671f37 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -20,24 +20,25 @@</span><br><span> simtrace2/simtrace_prot.h \</span><br><span> simtrace2/simtrace_usb.h</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = pcsc_test remsim-bankd remsim-client simtrace2-remsim-client</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = osmo-remsim-bankd osmo-remsim-client-st2</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_PROGRAMS = pcsc_test remsim-client</span><br><span> </span><br><span> pcsc_test_SOURCES = driver_core.c driver_pcsc.c main.c</span><br><span> pcsc_test_LDADD = $(OSMOCORE_LIBS) \</span><br><span> $(PCSC_LIBS) libosmo-rspro.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-remsim_bankd_SOURCES = slotmap.c bankd_main.c bankd_pcsc.c rspro_client_fsm.c debug.c</span><br><span style="color: hsl(0, 100%, 40%);">-remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(PCSC_LIBS) libosmo-rspro.la -lcsv</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_bankd_SOURCES = slotmap.c bankd_main.c bankd_pcsc.c rspro_client_fsm.c debug.c</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(PCSC_LIBS) libosmo-rspro.la -lcsv</span><br><span> </span><br><span> remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c bankd_client_fsm.c debug.c</span><br><span> remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span> libosmo-rspro.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-simtrace2_remsim_client_SOURCES = simtrace2-remsim_client.c \</span><br><span style="color: hsl(0, 100%, 40%);">- bankd_client_fsm.c rspro_client_fsm.c debug.c \</span><br><span style="color: hsl(0, 100%, 40%);">- simtrace2/apdu_dispatch.c \</span><br><span style="color: hsl(0, 100%, 40%);">- simtrace2/simtrace2-discovery.c \</span><br><span style="color: hsl(0, 100%, 40%);">- simtrace2/libusb_util.c</span><br><span style="color: hsl(0, 100%, 40%);">-simtrace2_remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) $(USB_LIBS) $(OSMOSIM_LIBS)\</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-rspro.la</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ bankd_client_fsm.c rspro_client_fsm.c debug.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ simtrace2/apdu_dispatch.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ simtrace2/simtrace2-discovery.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ simtrace2/libusb_util.c</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(USB_LIBS) $(OSMOSIM_LIBS) libosmo-rspro.la</span><br><span>diff --git a/src/server/Makefile.am b/src/server/Makefile.am</span><br><span>index 5926dee..ce114b6 100644</span><br><span>--- a/src/server/Makefile.am</span><br><span>+++ b/src/server/Makefile.am</span><br><span>@@ -6,12 +6,13 @@</span><br><span> </span><br><span> noinst_HEADERS = rspro_server.h rest_api.h</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = remsim-server</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = osmo-remsim-server</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-remsim_server_SOURCES = remsim_server.c rspro_server.c rest_api.c ../rspro_util.c ../slotmap.c ../debug.c</span><br><span style="color: hsl(0, 100%, 40%);">-remsim_server_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(ULFIUS_LIBS) $(JANSSON_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/libosmo-rspro.la</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_server_SOURCES = remsim_server.c rspro_server.c rest_api.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ ../rspro_util.c ../slotmap.c ../debug.c</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_server_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(ULFIUS_LIBS) $(JANSSON_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/libosmo-rspro.la</span><br><span> </span><br><span> # as suggested in http://lists.gnu.org/archive/html/automake/2009-03/msg00011.html</span><br><span> FORCE:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13498">change 13498</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/13498"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4498a004519499cc4b897a68c7f33efe29a63425 </div>
<div style="display:none"> Gerrit-Change-Number: 13498 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>