remsim-client: move from common 'src' directory to 'src/client'

As both the bankd and the server already are in src/bankd and
src/server, respectively: Let's unify this and have the client
also in its own sub-directory.

Change-Id: I67a3a5941434f09f7099c2cdb19c126cea305a73
changes/23/16623/6
Harald Welte 3 years ago
parent a86e6b73d8
commit f7598fe417
  1. 20
      configure.ac
  2. 19
      src/Makefile.am
  3. 2
      src/bankd/bankd.h
  4. 20
      src/client/Makefile.am
  5. 0
      src/client/client.h
  6. 0
      src/client/remsim_client.c
  7. 0
      src/client/simtrace2-remsim_client.c
  8. 4
      src/rspro_client_fsm.c
  9. 2
      src/rspro_client_fsm.h

@ -38,10 +38,6 @@ AC_CHECK_HEADERS([csv.h])
PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.3.0)
PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0)
PKG_CHECK_MODULES(OSMOABIS, libosmoabis)
PKG_CHECK_MODULES(OSMOSIM, libosmosim)
PKG_CHECK_MODULES(OSMOUSB, libosmousb)
PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2)
PKG_CHECK_MODULES(USB, libusb-1.0)
AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])],
[osmo_ac_build_server="$enableval"],[osmo_ac_build_server="yes"])
@ -58,11 +54,24 @@ AC_ARG_ENABLE([remsim-bankd],[AS_HELP_STRING([--disable-remsim-bankd], [Build os
[osmo_ac_build_bankd="$enableval"],[osmo_ac_build_bankd="yes"])
if test "$osmo_ac_build_bankd" = "yes"; then
AC_DEFINE(BUILD_BANKD, 1, [Define if we want to build osmo-remsim-bankd])
PKG_CHECK_MODULES(OSMOSIM, libosmosim)
PKG_CHECK_MODULES(PCSC, libpcsclite)
fi
AM_CONDITIONAL(BUILD_BANKD, test "x$osmo_ac_build_bankd" = "xyes")
PKG_CHECK_MODULES(PCSC, libpcsclite)
AC_SUBST(BUILD_BANKD)
AC_ARG_ENABLE([remsim-client],[AS_HELP_STRING([--disable-remsim-client], [Build osmo-remsim-client])],
[osmo_ac_build_client="$enableval"],[osmo_ac_build_client="yes"])
if test "$osmo_ac_build_client" = "yes"; then
AC_DEFINE(BUILD_CLIENT, 1, [Define if we want to build osmo-remsim-client])
PKG_CHECK_MODULES(OSMOSIM, libosmosim)
PKG_CHECK_MODULES(OSMOUSB, libosmousb)
PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2)
PKG_CHECK_MODULES(USB, libusb-1.0)
fi
AM_CONDITIONAL(BUILD_CLIENT, test "x$osmo_ac_build_client" = "xyes")
AC_SUBST(BUILD_CLIENT)
AC_CONFIG_MACRO_DIR([m4])
@ -155,6 +164,7 @@ AC_OUTPUT(
src/Makefile
src/rspro/Makefile
src/bankd/Makefile
src/client/Makefile
src/server/Makefile
include/Makefile
include/osmocom/Makefile

@ -5,11 +5,12 @@ endif
if BUILD_SERVER
SUBDIRS += server
endif
if BUILD_CLIENT
SUBDIRS += client
endif
AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \
$(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \
$(PCSC_CFLAGS) $(USB_CFLAGS) $(OSMOSIM_CFLAGS) \
$(OSMOSIMTRACE2_CFLAGS) \
-I$(top_srcdir)/include/osmocom/rspro
RSPRO_LIBVERSION=1:0:0
@ -19,17 +20,5 @@ libosmo_rspro_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
rspro/libosmo-asn1-rspro.la
libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c
noinst_HEADERS = debug.h client.h rspro_util.h slotmap.h rspro_client_fsm.h \
noinst_HEADERS = debug.h rspro_util.h slotmap.h rspro_client_fsm.h \
asn1c_helpers.h
bin_PROGRAMS = osmo-remsim-client-st2
remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c debug.c
remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
libosmo-rspro.la
osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \
rspro_client_fsm.c debug.c
osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
$(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \
$(USB_LIBS) $(OSMOSIM_LIBS) libosmo-rspro.la

@ -14,7 +14,7 @@
#include "rspro_util.h"
#include "slotmap.h"
#include "client.h"
#include "rspro_client_fsm.h"
#include "debug.h"
extern struct value_string worker_state_names[];

@ -0,0 +1,20 @@
AM_CFLAGS = -Wall -I$(top_srcdir)/include -I/$(top_builddir)/include -I$(top_srcdir)/src \
$(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \
$(PCSC_CFLAGS) $(USB_CFLAGS) $(OSMOSIM_CFLAGS) \
$(OSMOSIMTRACE2_CFLAGS) \
-I$(top_srcdir)/include/osmocom/rspro
bin_PROGRAMS = osmo-remsim-client-st2
remsim_client_SOURCES = remsim_client.c ../rspro_client_fsm.c ../debug.c
remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
$(top_builddir)/src/libosmo-rspro.la
osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \
../rspro_client_fsm.c ../debug.c
osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
$(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \
$(USB_LIBS) $(OSMOSIM_LIBS) \
$(top_builddir)/src/libosmo-rspro.la
noinst_HEADERS = client.h

@ -35,8 +35,8 @@
#include <osmocom/abis/ipa.h>
#include <osmocom/gsm/protocol/ipaccess.h>
#include "client.h"
#include "rspro_util.h"
#include "debug.h"
#include "rspro_client_fsm.h"
#define S(x) (1 << (x))

@ -4,6 +4,8 @@
#include <osmocom/abis/ipa.h>
#include <osmocom/rspro/RsproPDU.h>
#include "rspro_util.h"
enum server_conn_fsm_event {
SRVC_E_ESTABLISH, /* instruct SRVC to (re)etablish TCP connection to bankd */
SRVC_E_TCP_UP,

Loading…
Cancel
Save