<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16623">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;">remsim-client: move from common 'src' directory to 'src/client'<br><br>As both the bankd and the server already are in src/bankd and<br>src/server, respectively: Let's unify this and have the client<br>also in its own sub-directory.<br><br>Change-Id: I67a3a5941434f09f7099c2cdb19c126cea305a73<br>---<br>M configure.ac<br>M src/Makefile.am<br>M src/bankd/bankd.h<br>A src/client/Makefile.am<br>R src/client/client.h<br>R src/client/remsim_client.c<br>R src/client/simtrace2-remsim_client.c<br>M src/rspro_client_fsm.c<br>M src/rspro_client_fsm.h<br>9 files changed, 44 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 31af887..1c9cd72 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -38,10 +38,6 @@</span><br><span> PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.3.0)</span><br><span> PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0)</span><br><span> PKG_CHECK_MODULES(OSMOABIS, libosmoabis)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(OSMOSIM, libosmosim)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(OSMOUSB, libosmousb)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(USB, libusb-1.0)</span><br><span> </span><br><span> AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])],</span><br><span> [osmo_ac_build_server="$enableval"],[osmo_ac_build_server="yes"])</span><br><span>@@ -58,11 +54,24 @@</span><br><span> [osmo_ac_build_bankd="$enableval"],[osmo_ac_build_bankd="yes"])</span><br><span> if test "$osmo_ac_build_bankd" = "yes"; then</span><br><span> AC_DEFINE(BUILD_BANKD, 1, [Define if we want to build osmo-remsim-bankd])</span><br><span style="color: hsl(120, 100%, 40%);">+ PKG_CHECK_MODULES(OSMOSIM, libosmosim)</span><br><span style="color: hsl(120, 100%, 40%);">+ PKG_CHECK_MODULES(PCSC, libpcsclite)</span><br><span> fi</span><br><span> AM_CONDITIONAL(BUILD_BANKD, test "x$osmo_ac_build_bankd" = "xyes")</span><br><span style="color: hsl(0, 100%, 40%);">- PKG_CHECK_MODULES(PCSC, libpcsclite)</span><br><span> AC_SUBST(BUILD_BANKD)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_ENABLE([remsim-client],[AS_HELP_STRING([--disable-remsim-client], [Build osmo-remsim-client])],</span><br><span style="color: hsl(120, 100%, 40%);">+ [osmo_ac_build_client="$enableval"],[osmo_ac_build_client="yes"])</span><br><span style="color: hsl(120, 100%, 40%);">+if test "$osmo_ac_build_client" = "yes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE(BUILD_CLIENT, 1, [Define if we want to build osmo-remsim-client])</span><br><span style="color: hsl(120, 100%, 40%);">+ PKG_CHECK_MODULES(OSMOSIM, libosmosim)</span><br><span style="color: hsl(120, 100%, 40%);">+ PKG_CHECK_MODULES(OSMOUSB, libosmousb)</span><br><span style="color: hsl(120, 100%, 40%);">+ PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2)</span><br><span style="color: hsl(120, 100%, 40%);">+ PKG_CHECK_MODULES(USB, libusb-1.0)</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONDITIONAL(BUILD_CLIENT, test "x$osmo_ac_build_client" = "xyes")</span><br><span style="color: hsl(120, 100%, 40%);">+AC_SUBST(BUILD_CLIENT)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> AC_CONFIG_MACRO_DIR([m4])</span><br><span> </span><br><span>@@ -155,6 +164,7 @@</span><br><span> src/Makefile</span><br><span> src/rspro/Makefile</span><br><span> src/bankd/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ src/client/Makefile</span><br><span> src/server/Makefile</span><br><span> include/Makefile</span><br><span> include/osmocom/Makefile</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 58f02e8..c954db2 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -5,11 +5,12 @@</span><br><span> if BUILD_SERVER</span><br><span> SUBDIRS += server</span><br><span> endif</span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_CLIENT</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS += client</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span> </span><br><span> AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \</span><br><span> $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(PCSC_CFLAGS) $(USB_CFLAGS) $(OSMOSIM_CFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(OSMOSIMTRACE2_CFLAGS) \</span><br><span> -I$(top_srcdir)/include/osmocom/rspro</span><br><span> </span><br><span> RSPRO_LIBVERSION=1:0:0</span><br><span>@@ -19,17 +20,5 @@</span><br><span> rspro/libosmo-asn1-rspro.la</span><br><span> libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = debug.h client.h rspro_util.h slotmap.h rspro_client_fsm.h \</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = debug.h rspro_util.h slotmap.h rspro_client_fsm.h \</span><br><span> asn1c_helpers.h</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = osmo-remsim-client-st2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c debug.c</span><br><span style="color: hsl(0, 100%, 40%);">-remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-rspro.la</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \</span><br><span style="color: hsl(0, 100%, 40%);">- rspro_client_fsm.c debug.c</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(USB_LIBS) $(OSMOSIM_LIBS) libosmo-rspro.la</span><br><span>diff --git a/src/bankd/bankd.h b/src/bankd/bankd.h</span><br><span>index d713ed1..6de3213 100644</span><br><span>--- a/src/bankd/bankd.h</span><br><span>+++ b/src/bankd/bankd.h</span><br><span>@@ -14,7 +14,7 @@</span><br><span> </span><br><span> #include "rspro_util.h"</span><br><span> #include "slotmap.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "client.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "rspro_client_fsm.h"</span><br><span> #include "debug.h"</span><br><span> </span><br><span> extern struct value_string worker_state_names[];</span><br><span>diff --git a/src/client/Makefile.am b/src/client/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..106bc5e</span><br><span>--- /dev/null</span><br><span>+++ b/src/client/Makefile.am</span><br><span>@@ -0,0 +1,20 @@</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS = -Wall -I$(top_srcdir)/include -I/$(top_builddir)/include -I$(top_srcdir)/src \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(PCSC_CFLAGS) $(USB_CFLAGS) $(OSMOSIM_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMOSIMTRACE2_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ -I$(top_srcdir)/include/osmocom/rspro</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = osmo-remsim-client-st2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+remsim_client_SOURCES = remsim_client.c ../rspro_client_fsm.c ../debug.c</span><br><span style="color: hsl(120, 100%, 40%);">+remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/libosmo-rspro.la</span><br><span style="color: hsl(120, 100%, 40%);">+</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%);">+ ../rspro_client_fsm.c ../debug.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%);">+ $(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(USB_LIBS) $(OSMOSIM_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/libosmo-rspro.la</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = client.h </span><br><span>diff --git a/src/client.h b/src/client/client.h</span><br><span>similarity index 100%</span><br><span>rename from src/client.h</span><br><span>rename to src/client/client.h</span><br><span>diff --git a/src/remsim_client.c b/src/client/remsim_client.c</span><br><span>similarity index 100%</span><br><span>rename from src/remsim_client.c</span><br><span>rename to src/client/remsim_client.c</span><br><span>diff --git a/src/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c</span><br><span>similarity index 100%</span><br><span>rename from src/simtrace2-remsim_client.c</span><br><span>rename to src/client/simtrace2-remsim_client.c</span><br><span>diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c</span><br><span>index 758bde7..d5cf04b 100644</span><br><span>--- a/src/rspro_client_fsm.c</span><br><span>+++ b/src/rspro_client_fsm.c</span><br><span>@@ -35,8 +35,8 @@</span><br><span> #include <osmocom/abis/ipa.h></span><br><span> #include <osmocom/gsm/protocol/ipaccess.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "client.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "rspro_util.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "rspro_client_fsm.h"</span><br><span> </span><br><span> #define S(x) (1 << (x))</span><br><span> </span><br><span>diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h</span><br><span>index ca59c77..2f3f7fc 100644</span><br><span>--- a/src/rspro_client_fsm.h</span><br><span>+++ b/src/rspro_client_fsm.h</span><br><span>@@ -4,6 +4,8 @@</span><br><span> #include <osmocom/abis/ipa.h></span><br><span> #include <osmocom/rspro/RsproPDU.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "rspro_util.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum server_conn_fsm_event {</span><br><span> SRVC_E_ESTABLISH, /* instruct SRVC to (re)etablish TCP connection to bankd */</span><br><span> SRVC_E_TCP_UP,</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: 6 </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>