Osmocom Open Build Service

osmo-remsim.spec Deleted

@@ -1,230 +0,0 @@
-#
-# spec file for package osmo-remsim
-#
-# Copyright (c) 2018, Martin Hauke <mardnh@gmx.de>
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-%define sover 2
-Name:           osmo-remsim
-Requires: osmocom-latest
-Version:  1.0.0
-Release:        0
-Summary:        Osmocom remote SIM software suite
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-URL:            https://osmocom.org/projects/osmo-remsim
-Source:  osmo-remsim_1.0.0.tar.gz
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libcsv-devel
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
-%if 0%{?suse_version}
-BuildRequires:  systemd-rpm-macros
-%endif
-BuildRequires:  pkgconfig(libasn1c) >= 0.9.30
-BuildRequires:  pkgconfig(libosmoabis)
-BuildRequires:  pkgconfig(libosmocore) >= 1.6.0
-BuildRequires:  pkgconfig(libosmogsm) >= 0.11.0
-BuildRequires:  pkgconfig(libosmosim)
-BuildRequires:  pkgconfig(libpcsclite)
-BuildRequires:  pkgconfig(libulfius)
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  pkgconfig(libosmousb)
-BuildRequires:  pkgconfig(libosmo-simtrace2) >= 0.8.0
-%{?systemd_requires}
-
-%description
-osmo-remsim is a suite of software programs enabling physical/geographic
-separation of a cellular phone (or modem) on the one hand side and the
-SIM/USIM/ISIM card on the other side.
-
-Using osmo-remsim, you can operate an entire fleet of modems/phones, as
-well as banks of SIM cards and dynamically establish or remove the
-connections between modems/phones and cards.
-
-So in technical terms, it behaves like a proxy for the ISO 7816 smart
-card interface between the MS/UE and the UICC/SIM/USIM/ISIM.
-
-While originally designed to be used in context of cellular networks,
-there is nothing cellular specific in the system.  It can therefore also
-be used with other systems that use contact based smart cards according
-to ISO 7816.  Currently only the T=0 protocol with standard
-(non-extended) APDUs is supported. Both T=1 and extended APDU support
-can easily be added as a pure software update, should it be required at
-some future point.
-
-%package -n libosmo-rspro%{sover}
-Requires: osmocom-latest
-Summary:        Osmocom Remote SIM - Shared Library
-License:        GPL-2.0-or-later
-Group:          System/Libraries
-
-%description -n libosmo-rspro%{sover}
-libosmo-rsrpo is an utility library for encoding/decoding the ASN.1 BER
-based RSPRO (Remote SIM Protocol) protocol used between the osmo-remsim
-programs.
-
-%package -n libosmo-rspro-devel
-Requires: osmocom-latest
-Summary:        Osmocom Remote SIM - Shared Library Development Haders
-License:        GPL-2.0-or-later
-Group:          Development/Libraries/C and C++
-Requires:       libosmo-rspro%{sover} = %{version}
-
-%description -n libosmo-rspro-devel
-libosmo-rsrpo is an utility library for encoding/decoding the ASN.1 BER
-based RSPRO (Remote SIM Protocol) protocol used between the osmo-remsim
-programs.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmo-rspro.
-
-%package -n osmo-remsim-server
-Requires: osmocom-latest
-Summary:        Osmocom Remote SIM - Central Server
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-
-%description -n osmo-remsim-server
-The remsim-server is the central element of a osmo-remsim deployment,
-it maintains a list of clients + bankds connected to it, as well as the
-dynamic SIM card mappings between them.
-
-%package -n osmo-remsim-bankd
-Requires: osmocom-latest
-Summary:        Osmocom Remote SIM - Bank Daemon
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-
-%description -n osmo-remsim-bankd
-The remsim-bankd is managing a bank of SIM card readers and their
-respective cards. It establishes a control connection to remsim-server
-and receives inbound connections from remsim-clients.
-
-%package -n osmo-remsim-client-st2
-Requires: osmocom-latest
-Summary:        Osmocom Remote SIM - Client for SIMtrace2
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-
-%description -n osmo-remsim-client-st2
-Description: Osmocom Remote SIM - Client for SIMtrace2 cardem firmware
-The remsim-client is managing a given phone/modem.  It attaches to the
-'cardem' firmware of a SIMtrcace2 (or compatible, such as sysmoQMOD)
-hardware and forwards the SIM card communication to a remsim-bankd,
-under the control of remsim-server.
-
-%package -n osmo-remsim-client-shell
-Requires: osmocom-latest
-Summary:        Osmocom Remote SIM - Interactive Client
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-
-%description -n osmo-remsim-client-shell
-The remsim-client-shell is for manually interacting with a remote SIM
-card via remsim-bankd + remsim-server.  It's mostly a test/debug tool.
-
-%package -n libifd-osmo-remsim-client0
-Requires: osmocom-latest
-Summary:        Osmocom Remote SIM Client - PC/SC driver
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-Requires:       pcsc-lite
-
-%description -n libifd-osmo-remsim-client0
-This is an incarnation of osmo-remsim-client which can plug as ifd_handler
-driver into pcscd.  This means you can use remote smart cards managed
-by osmo-remsim-server via normal PC/SC applications.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
-    --disable-static \
-    --docdir=%{_docdir}/osmo-remsim \
-    --with-systemdsystemunitdir=%{_unitdir}
-make V=1 %{?_smp_mflags}
-
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-make %{?_smp_mflags} check || find . -name testsuite.log -exec cat {} +
-
-%post   -n libosmo-rspro%{sover} -p /sbin/ldconfig
-%postun -n libosmo-rspro%{sover} -p /sbin/ldconfig
-
-%if 0%{?suse_version}
-%pre    -n osmo-remsim-bankd %service_add_pre     osmo-remsim-bankd.service
-%post   -n osmo-remsim-bankd %service_add_post    osmo-remsim-bankd.service
-%preun  -n osmo-remsim-bankd %service_del_preun   osmo-remsim-bankd.service
-%postun -n osmo-remsim-bankd %service_del_postun  osmo-remsim-bankd.service
-
-%pre    -n osmo-remsim-client-st2 %service_add_pre     osmo-remsim-client@.service
-%post   -n osmo-remsim-client-st2 %service_add_post    osmo-remsim-client@.service
-%preun  -n osmo-remsim-client-st2 %service_del_preun   osmo-remsim-client@.service
-%postun -n osmo-remsim-client-st2 %service_del_postun  osmo-remsim-client@.service
-
-%pre    -n osmo-remsim-server %service_add_pre    osmo-remsim-server.service
-%post   -n osmo-remsim-server %service_add_post   osmo-remsim-server.service
-%preun  -n osmo-remsim-server %service_del_preun  osmo-remsim-server.service
-%postun -n osmo-remsim-server %service_del_postun osmo-remsim-server.service
-%endif
-
-%files -n libosmo-rspro%{sover}
-%license COPYING
-%doc README.md
-%{_libdir}/libosmo-rspro.so.%{sover}*
-
-%files -n libosmo-rspro-devel
-%dir %{_includedir}/osmocom/rspro
-%{_includedir}/osmocom/rspro/*
-%{_libdir}/libosmo-rspro.so
-%{_libdir}/pkgconfig/libosmo-rspro.pc
-
-%files -n osmo-remsim-server
-%{_bindir}/osmo-remsim-server

osmo-remsim_1.0.0.tar.gz/contrib/osmo-remsim.spec.in Deleted

@@ -1,222 +0,0 @@
-#
-# spec file for package osmo-remsim
-#
-# Copyright (c) 2018, Martin Hauke <mardnh@gmx.de>
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-%define sover 2
-Name:           osmo-remsim
-Version:        @VERSION@
-Release:        0
-Summary:        Osmocom remote SIM software suite
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-URL:            https://osmocom.org/projects/osmo-remsim
-Source:         %{name}-%{version}.tar.xz
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libcsv-devel
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
-%if 0%{?suse_version}
-BuildRequires:  systemd-rpm-macros
-%endif
-BuildRequires:  pkgconfig(libasn1c) >= 0.9.30
-BuildRequires:  pkgconfig(libosmoabis)
-BuildRequires:  pkgconfig(libosmocore) >= 1.6.0
-BuildRequires:  pkgconfig(libosmogsm) >= 0.11.0
-BuildRequires:  pkgconfig(libosmosim)
-BuildRequires:  pkgconfig(libpcsclite)
-BuildRequires:  pkgconfig(libulfius)
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  pkgconfig(libosmousb)
-BuildRequires:  pkgconfig(libosmo-simtrace2) >= 0.8.0
-%{?systemd_requires}
-
-%description
-osmo-remsim is a suite of software programs enabling physical/geographic
-separation of a cellular phone (or modem) on the one hand side and the
-SIM/USIM/ISIM card on the other side.
-
-Using osmo-remsim, you can operate an entire fleet of modems/phones, as
-well as banks of SIM cards and dynamically establish or remove the
-connections between modems/phones and cards.
-
-So in technical terms, it behaves like a proxy for the ISO 7816 smart
-card interface between the MS/UE and the UICC/SIM/USIM/ISIM.
-
-While originally designed to be used in context of cellular networks,
-there is nothing cellular specific in the system.  It can therefore also
-be used with other systems that use contact based smart cards according
-to ISO 7816.  Currently only the T=0 protocol with standard
-(non-extended) APDUs is supported. Both T=1 and extended APDU support
-can easily be added as a pure software update, should it be required at
-some future point.
-
-%package -n libosmo-rspro%{sover}
-Summary:        Osmocom Remote SIM - Shared Library
-License:        GPL-2.0-or-later
-Group:          System/Libraries
-
-%description -n libosmo-rspro%{sover}
-libosmo-rsrpo is an utility library for encoding/decoding the ASN.1 BER
-based RSPRO (Remote SIM Protocol) protocol used between the osmo-remsim
-programs.
-
-%package -n libosmo-rspro-devel
-Summary:        Osmocom Remote SIM - Shared Library Development Haders
-License:        GPL-2.0-or-later
-Group:          Development/Libraries/C and C++
-Requires:       libosmo-rspro%{sover} = %{version}
-
-%description -n libosmo-rspro-devel
-libosmo-rsrpo is an utility library for encoding/decoding the ASN.1 BER
-based RSPRO (Remote SIM Protocol) protocol used between the osmo-remsim
-programs.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmo-rspro.
-
-%package -n osmo-remsim-server
-Summary:        Osmocom Remote SIM - Central Server
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-
-%description -n osmo-remsim-server
-The remsim-server is the central element of a osmo-remsim deployment,
-it maintains a list of clients + bankds connected to it, as well as the
-dynamic SIM card mappings between them.
-
-%package -n osmo-remsim-bankd
-Summary:        Osmocom Remote SIM - Bank Daemon
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-
-%description -n osmo-remsim-bankd
-The remsim-bankd is managing a bank of SIM card readers and their
-respective cards. It establishes a control connection to remsim-server
-and receives inbound connections from remsim-clients.
-
-%package -n osmo-remsim-client-st2
-Summary:        Osmocom Remote SIM - Client for SIMtrace2
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-
-%description -n osmo-remsim-client-st2
-Description: Osmocom Remote SIM - Client for SIMtrace2 cardem firmware
-The remsim-client is managing a given phone/modem.  It attaches to the
-'cardem' firmware of a SIMtrcace2 (or compatible, such as sysmoQMOD)
-hardware and forwards the SIM card communication to a remsim-bankd,
-under the control of remsim-server.
-
-%package -n osmo-remsim-client-shell
-Summary:        Osmocom Remote SIM - Interactive Client
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-
-%description -n osmo-remsim-client-shell
-The remsim-client-shell is for manually interacting with a remote SIM
-card via remsim-bankd + remsim-server.  It's mostly a test/debug tool.
-
-%package -n libifd-osmo-remsim-client0
-Summary:        Osmocom Remote SIM Client - PC/SC driver
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-Requires:       pcsc-lite
-
-%description -n libifd-osmo-remsim-client0
-This is an incarnation of osmo-remsim-client which can plug as ifd_handler
-driver into pcscd.  This means you can use remote smart cards managed
-by osmo-remsim-server via normal PC/SC applications.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
-    --disable-static \
-    --docdir=%{_docdir}/osmo-remsim \
-    --with-systemdsystemunitdir=%{_unitdir}
-make V=1 %{?_smp_mflags}
-
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-make %{?_smp_mflags} check || find . -name testsuite.log -exec cat {} +
-
-%post   -n libosmo-rspro%{sover} -p /sbin/ldconfig
-%postun -n libosmo-rspro%{sover} -p /sbin/ldconfig
-
-%if 0%{?suse_version}
-%pre    -n osmo-remsim-bankd %service_add_pre     osmo-remsim-bankd.service
-%post   -n osmo-remsim-bankd %service_add_post    osmo-remsim-bankd.service
-%preun  -n osmo-remsim-bankd %service_del_preun   osmo-remsim-bankd.service
-%postun -n osmo-remsim-bankd %service_del_postun  osmo-remsim-bankd.service
-
-%pre    -n osmo-remsim-client-st2 %service_add_pre     osmo-remsim-client@.service
-%post   -n osmo-remsim-client-st2 %service_add_post    osmo-remsim-client@.service
-%preun  -n osmo-remsim-client-st2 %service_del_preun   osmo-remsim-client@.service
-%postun -n osmo-remsim-client-st2 %service_del_postun  osmo-remsim-client@.service
-
-%pre    -n osmo-remsim-server %service_add_pre    osmo-remsim-server.service
-%post   -n osmo-remsim-server %service_add_post   osmo-remsim-server.service
-%preun  -n osmo-remsim-server %service_del_preun  osmo-remsim-server.service
-%postun -n osmo-remsim-server %service_del_postun osmo-remsim-server.service
-%endif
-
-%files -n libosmo-rspro%{sover}
-%license COPYING
-%doc README.md
-%{_libdir}/libosmo-rspro.so.%{sover}*
-
-%files -n libosmo-rspro-devel
-%dir %{_includedir}/osmocom/rspro
-%{_includedir}/osmocom/rspro/*
-%{_libdir}/libosmo-rspro.so
-%{_libdir}/pkgconfig/libosmo-rspro.pc
-
-%files -n osmo-remsim-server
-%{_bindir}/osmo-remsim-server
-%{_unitdir}/osmo-remsim-server.service
-
-%files -n osmo-remsim-bankd
-%{_bindir}/osmo-remsim-bankd
-%{_unitdir}/osmo-remsim-bankd.service
-%config(noreplace) %{_sysconfdir}/default/osmo-remsim-bankd
-%dir %{_sysconfdir}/osmocom
-%config(noreplace) %{_sysconfdir}/osmocom/bankd_pcsc_slots.csv

osmo-remsim_1.0.0.tar.gz/include/osmocom/rspro/rspro_client.h Deleted

@@ -1,59 +0,0 @@
-/* Remote SIM Protocol client */
-
-/* (C) 2018 by Harald Welte <laforge@gnumonks.org>
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include <osmocom/core/timer.h>
-
-/* a loss of RSPRO is considered quite serious, let's try to recover as quickly as
- * possible.  Even one new connection attempt per second should be quite acceptable until the link is
- * re-established */
-#define OSMO_RSPRO_CLIENT_RECONNECT_INTERVAL 1
-#define OSMO_RSPRO_CLIENT_PING_INTERVAL 20
-
-struct msgb;
-struct ipa_client_conn;
-struct osmo_rspro_client;
-
-/* Expects message in msg->l2h */
-typedef int (*osmo_rspro_client_read_cb_t)(struct osmo_rspro_client *rsproc, struct msgb *msg);
-
-struct osmo_rspro_client {
-	const char *unit_name;
-
-	struct ipa_client_conn *link;
-	osmo_rspro_client_read_cb_t read_cb;
-	void *data;
-
-	struct osmo_timer_list ping_timer;
-	struct osmo_timer_list connect_timer;
-	int is_connected;
-	int got_ipa_pong;
-};
-
-struct osmo_rspro_client *osmo_rspro_client_create(void *talloc_ctx,
-						 const char *unit_name,
-						 const char *ip_addr,
-						 unsigned int tcp_port,
-						 osmo_rspro_client_read_cb_t read_cb);
-
-void osmo_rspro_client_destroy(struct osmo_rspro_client *rsproc);
-int osmo_rspro_client_send(struct osmo_rspro_client *rsproc, struct msgb *msg);
-struct msgb *osmo_rspro_client_msgb_alloc(void);
-

osmo-remsim_1.0.0.dsc -> osmo-remsim_1.1.0.dsc Changed

@@ -1,26 +1,27 @@
 Format: 1.0
 Source: osmo-remsim
-Binary: libosmo-rspro2, libosmo-rspro-dev, osmo-remsim-server, osmo-remsim-bankd, osmo-remsim-client-st2, osmo-remsim-client-shell, libifd-osmo-remsim-client0, osmo-remsim-doc
+Binary: libosmo-rspro2, libosmo-rspro-dev, osmo-remsim-server, osmo-remsim-apitool, osmo-remsim-bankd, osmo-remsim-client-st2, osmo-remsim-client-shell, libifd-osmo-remsim-client0, osmo-remsim-doc
 Architecture: any all
-Version: 1.0.0
-Maintainer: Harald Welte <laforge@gnumonks.org>
+Version: 1.1.0
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-remsim
 Standards-Version: 3.9.8
-Vcs-Browser: http://git.osmocom.org/osmo-remsim/
-Vcs-Git: git://git.osmocom.org/osmo-remsim
-Build-Depends: debhelper (>= 9), pkg-config, dh-autoreconf, autotools-dev, osmo-gsm-manuals-dev, libcsv-dev, libosmocore-dev (>= 1.6.0), libosmo-abis-dev, libosmo-simtrace2-dev (>= 0.8.0), libpcsclite-dev, libusb-1.0-0-dev, libulfius-dev, libjansson-dev
+Vcs-Browser: https://gitea.osmocom.org/sim-card/osmo-remsim
+Vcs-Git: https://gitea.osmocom.org/sim-card/osmo-remsim
+Build-Depends: debhelper (>= 10), pkg-config, dh-autoreconf, autotools-dev, osmo-gsm-manuals-dev, libcsv-dev, libosmocore-dev (>= 1.11.0), libosmo-netif-dev (>= 1.6.0), libosmo-simtrace2-dev (>= 0.9.0), libpcsclite-dev, libusb-1.0-0-dev, libulfius-dev, libjansson-dev
 Package-List:
  libifd-osmo-remsim-client0 deb net optional arch=any
  libosmo-rspro-dev deb libdevel optional arch=any
  libosmo-rspro2 deb libs optional arch=any
+ osmo-remsim-apitool deb net optional arch=any
  osmo-remsim-bankd deb net optional arch=any
  osmo-remsim-client-shell deb net optional arch=any
  osmo-remsim-client-st2 deb net optional arch=any
  osmo-remsim-doc deb doc optional arch=all
  osmo-remsim-server deb net optional arch=any
 Checksums-Sha1:
- 026cd11ba85f114f89aaed906925d707bd818a2d 202128 osmo-remsim_1.0.0.tar.gz
+ c3aca7cfbe0c8a38e72555d76acfe0629334fdee 1189296 osmo-remsim_1.1.0.tar.gz
 Checksums-Sha256:
- 7654d93d0d59647732162e0c09b829ddc7ce9823740b5f3f67aea7ea3be4208c 202128 osmo-remsim_1.0.0.tar.gz
+ ec9ccdc23b3c4e6f239ea454f56e544351b742f56799fb5ae900760492e8411c 1189296 osmo-remsim_1.1.0.tar.gz
 Files:
- 3edba69dd43925f37d5705b0c3dfc981 202128 osmo-remsim_1.0.0.tar.gz
+ ee5233974e1bb5361ad56069d9995a87 1189296 osmo-remsim_1.1.0.tar.gz

osmo-remsim_1.1.0.tar.gz/.checkpatch.conf Added

osmo-remsim_1.1.0.tar.gz/.git Added

osmo-remsim_1.1.0.tar.gz/.git/HEAD Added

osmo-remsim_1.1.0.tar.gz/.git/ORIG_HEAD Added

osmo-remsim_1.1.0.tar.gz/.git/branches Added

osmo-remsim_1.1.0.tar.gz/.git/config Added

osmo-remsim_1.1.0.tar.gz/.git/description Added

osmo-remsim_1.1.0.tar.gz/.git/hooks Added

osmo-remsim_1.1.0.tar.gz/.git/hooks/applypatch-msg.sample Added

osmo-remsim_1.1.0.tar.gz/.git/hooks/commit-msg.sample Added

osmo-remsim_1.1.0.tar.gz/.git/hooks/fsmonitor-watchman.sample Added

@@ -0,0 +1,174 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	my $last_update_line = "";
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+		$last_update_line = qq\n"since": $last_update_token,;
+	}
+	my $query = <<"	END";
+		"query", "$git_work_tree", {$last_update_line
+			"fields": "name",
+			"expression": "not", "dirname", ".git"
+		}
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}

osmo-remsim_1.1.0.tar.gz/.git/hooks/post-update.sample Added

osmo-remsim_1.1.0.tar.gz/.git/hooks/pre-applypatch.sample Added

osmo-remsim_1.1.0.tar.gz/.git/hooks/pre-commit.sample Added

@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if  "$allownonascii" != "true"  &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d ' -~\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

osmo-remsim_1.1.0.tar.gz/.git/hooks/pre-merge-commit.sample Added

osmo-remsim_1.1.0.tar.gz/.git/hooks/pre-push.sample Added

@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '0-9a-f' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+	if test "$local_oid" = "$zero"
+	then
+		# Handle delete
+		:
+	else
+		if test "$remote_oid" = "$zero"
+		then
+			# New branch, examine all commits
+			range="$local_oid"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_oid..$local_oid"
+		fi
+
+		# Check for WIP commit
+		commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+		if test -n "$commit"
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

osmo-remsim_1.1.0.tar.gz/.git/hooks/pre-rebase.sample Added

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up to date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV0;
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^(0-9a-f+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV1);
+		for my $elem (map {
+				/^(0-9a-f+) (.*)$/;
+				$1 => $2;
+			} split(/\n/, $ARGV2)) {
+			if (!exists $not_in_next{$elem->0}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->1\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END

osmo-remsim_1.1.0.tar.gz/.git/hooks/pre-receive.sample Added

osmo-remsim_1.1.0.tar.gz/.git/hooks/prepare-commit-msg.sample Added

@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
+
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    /usr/bin/perl -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
+
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^$.*>$.*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi

osmo-remsim_1.1.0.tar.gz/.git/hooks/push-to-checkout.sample Added

@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+	echo >&2 "$*"
+	exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+	die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+	die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+	head=HEAD
+else
+	head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+	die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+	die "Could not update working tree to new HEAD"
+fi

osmo-remsim_1.1.0.tar.gz/.git/hooks/update.sample Added

@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if  -z "$GIT_DIR" ; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if  -z "$refname" -o -z "$oldrev" -o -z "$newrev" ; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '0-9a-f' '0')
+if  "$newrev" = "$zero" ; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if  "$allowunannotated" != "true" ; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag  -a | -s ' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if  "$allowdeletetag" != "true" ; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if  "$allowmodifytag" != "true"  && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if  "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if  "$allowdeletebranch" != "true" ; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if  "$allowdeletebranch" != "true" ; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

osmo-remsim_1.1.0.tar.gz/.git/index Added

osmo-remsim_1.1.0.tar.gz/.git/info Added

osmo-remsim_1.1.0.tar.gz/.git/info/exclude Added

osmo-remsim_1.1.0.tar.gz/.git/logs Added

osmo-remsim_1.1.0.tar.gz/.git/logs/HEAD Added

osmo-remsim_1.1.0.tar.gz/.git/logs/refs Added

osmo-remsim_1.1.0.tar.gz/.git/logs/refs/heads Added

osmo-remsim_1.1.0.tar.gz/.git/logs/refs/heads/master Added

osmo-remsim_1.1.0.tar.gz/.git/logs/refs/remotes Added

osmo-remsim_1.1.0.tar.gz/.git/logs/refs/remotes/origin Added

osmo-remsim_1.1.0.tar.gz/.git/logs/refs/remotes/origin/HEAD Added

osmo-remsim_1.1.0.tar.gz/.git/objects Added

osmo-remsim_1.1.0.tar.gz/.git/objects/info Added

osmo-remsim_1.1.0.tar.gz/.git/objects/pack Added

osmo-remsim_1.1.0.tar.gz/.git/objects/pack/pack-b6798560926b3ba1fca52ceefa1f56de959de6f4.idx Added

osmo-remsim_1.1.0.tar.gz/.git/objects/pack/pack-b6798560926b3ba1fca52ceefa1f56de959de6f4.pack Added

osmo-remsim_1.1.0.tar.gz/.git/packed-refs Added

@@ -0,0 +1,25 @@
+# pack-refs with: peeled fully-peeled sorted 
+95c6c5d473db18b56b69e5a05036d35b7611ff04 refs/remotes/origin/kredon/simtrace
+d08d505941141d9b92edd4acd6eaad835f3eb6ff refs/remotes/origin/laforge/bankd-fsm-mistake
+0c1b7767c382d7c62dab51e815a5552ee709c30f refs/remotes/origin/lynxis/presence-pol
+63266a836f361931d31ba8381ce12ac71c7314d3 refs/remotes/origin/master
+55adb09c291e33caef75d80c8823e3ec2a2253f5 refs/remotes/origin/osmith/release
+5a07a927b02072b86a36b97e2da83edb6eefe008 refs/remotes/origin/pespin/0.2.2
+ab1634646bd97eb675e755c9c0ab151fab1886f6 refs/tags/0.0
+^3aa901da56c6346a329791666004482281024233
+be796d986a0fd2df47ebcac01eeadc18ae421669 refs/tags/0.1.0
+^0138bb40b4084a82d5997cf1333e90cb906c3dc9
+0712db450ff51ddba54068e7bd3b3112c4991b78 refs/tags/0.2.0
+^2f238cfac9d2f9296a860c26afb5a834dfd533fa
+bde5ab2ebc3f8b05d2119e3b3ece94cab622d8c6 refs/tags/0.2.1
+^6478cdac2d8af9bb31c89bdae34f00a04bfd9f78
+dbaf50fdb4a5aa26bfc4f2a8e57cf94bfab6d86b refs/tags/0.2.2
+^b2a00776a04cd826a1c39bfb8e9cc5879e25f761
+85eafc2fd81e95ee2c30d6510a077c4d81d94511 refs/tags/0.2.3
+^5a07a927b02072b86a36b97e2da83edb6eefe008
+b274ca31703b6a321ea9defd1fe8f183f29fd3ee refs/tags/0.2.4
+^c0de976daee45cf226687958ab31908b47b31bea
+5fafce7b739753e6371af5e80eb3fce407b94c3a refs/tags/1.0.0
+^5a3a0b16a0c5c0cebb4f425664effede90547f17
+1cbe67723381b2fea29e720e8c79d738978f0d6f refs/tags/1.1.0
+^63266a836f361931d31ba8381ce12ac71c7314d3

osmo-remsim_1.1.0.tar.gz/.git/refs Added

osmo-remsim_1.1.0.tar.gz/.git/refs/heads Added

osmo-remsim_1.1.0.tar.gz/.git/refs/heads/master Added

osmo-remsim_1.1.0.tar.gz/.git/refs/remotes Added

osmo-remsim_1.1.0.tar.gz/.git/refs/remotes/origin Added

osmo-remsim_1.1.0.tar.gz/.git/refs/remotes/origin/HEAD Added

osmo-remsim_1.1.0.tar.gz/.git/refs/tags Added

osmo-remsim_1.1.0.tar.gz/.github Added

osmo-remsim_1.1.0.tar.gz/.github/FUNDING.yml Added

osmo-remsim_1.1.0.tar.gz/.gitignore Added

osmo-remsim_1.1.0.tar.gz/.gitreview Added

osmo-remsim_1.0.0.tar.gz/.tarball-version -> osmo-remsim_1.1.0.tar.gz/.tarball-version Changed

osmo-remsim_1.0.0.tar.gz/Makefile.am -> osmo-remsim_1.1.0.tar.gz/Makefile.am Changed

osmo-remsim_1.0.0.tar.gz/README.md -> osmo-remsim_1.1.0.tar.gz/README.md Changed

@@ -1,89 +1,78 @@
 osmo-remsim - Osmocom remote SIM software suite
 ===============================================
 
-This software suite is a work in progress.
+osmo-remsim is a suite of software programs enabling physical/geographic separation of a cellular phone (or
+modem) on the one hand side and the SIM/USIM/ISIM card on the other side.
 
+Using osmo-remsim, you can operate an entire fleet of modems/phones, as well as banks of SIM cards and
+dynamically establish or remove the connections between modems/phones and cards.
 
-osmo-remsim-client
-------------------
+So in technical terms, it behaves like a proxy for the ISO 7816 smart card interface between the MS/UE and the
+UICC/SIM/USIM/ISIM.
 
-The client interfaces with GSM phones / modems via dedicated "Card
-Emulation" devices such as the Osmocom SIMtrace2 or sysmocom sysmoQMOD
-board + firmware.  This hardware implements the ISO7816-3 electrical
-interface and protocol handling and  passes any TPDU headers received
-from the phone/modem to osmo-remsim-client for further processing of the
-TPDUs associated to the given APDU transfer.
-
-osmo-remsim-client connects via a RSPRO control connection to
-osmo-remsim-server at startup and registers itself.  It will receive
-configuration data such as the osmo-remsim-bankd IP+Port and the
-ClientId from osmo-remsim-server.
-
-After receiving the configuration, osmo-remsim-client will establish a
-RSPRO data connection to the osmo-remsim-bankd IP:Port.
-
-As the USB interface for remote SIM in simtrace2.git uses one interface
-per slot, we can implement the client in blocking mode, i.e. use
-blocking I/O on the TCP/RSPRO side.  This simplifies the code compared
-to a more complex async implementation.
-
-
-osmo-remsim-bankd
------------------
-
-The osmo-remsim-bankd (SIM Bank Daemon) manages one given SIM bank.  The
-initial implementation supports a PC/SC driver to expose any PC/SC
-compatible card readers as SIM bank.
-
-osmo-remsim-bankd initially connects via a RSPRO control connection to
-osmo-remsim-server at startup, and will in turn receive a set of initial
-client,slot:bankd,slot mappings.  These mappings determine which
-slot on the client (corresponding to a modem) is mapped to which slot on
-the SIM bank.  Mappings can be updated by osmo-remsim-server at any given
-point in time.
-
-osmo-remsim-bankd implements a RSPRO server, where it listens to
-connections from osmo-remsim-clients.
-
-As PC/SC only offers a blocking API, there is one thread per PC/SC slot.
-This thread will perform blocking I/O on the socket towards the client,
-and blocking API calls on PC/SC.
-
-In terms of thread handling, we do:
-
-* accept() handling in spare worker threads
-** this means blocking I/O can be used, as each worker thread only has
-   one TCP connection
-** client identifies itself with client:slot
-** lookup mapping based on client:slot (using mutex for protection)
-** open the reader based on the lookup result
-
-The worker threads initially don't have any mapping to a specific
-reader, and that mapping is only established at a later point after the
-client has identified itself.  The advantage is that the entire bankd
-can live without any non-blocking I/O.
-
-The main thread handles the connection to osmo-remsim-server, where it
-can also use non-blocking I/O.  However, re-connection would be
-required, to avoid stalling all banks/cards in the event of a connection
-loss to the server.
-
-worker threads have the following states:
-* INIT (just started)
-* ACCEPTING (they're blocking in the accept() call on the server socket fd)
-* CONNECTED_WAIT_ID (TCP established, but peer not yet identified itself)
-* CONNECTED_CLIENT (TCP established, client has identified itself, no mapping)
-* CONNECTED_CLIENT_MAPPED (TCP established, client has identified itself, mapping exists)
-* CONNECTED_CLIENT_MAPPED_CARD (TCP established, client identified, mapping exists, card opened)
-* CONNECTED_SERVER (TCP established, server has identified itself)
-
-Once the client disconnects, or any other error occurs (such as card I/O
-errors), the worker thread either returns to INIT state (closing client
-socket and reader), or it terminates.  Termination would mean that the
-main thread would have to do non-blocking join to detect client
-termination and then re-spawn clients, so the "return to INIT state"
-approach seems to make more sense.
-
-Open topics:
-* detecting multiple connections from a server, logging this or even
-  avoiding that situation
+While originally designed to be used in context of cellular networks, there is nothing cellular specific in
+the system. It can therefore also be used with other systems that use contact based smart cards according to
+ISO 7816. Currently only the T=0 protocol with standard (non-extended) APDUs is supported.
+
+Homepage
+--------
+Please visit the official homepage(https://osmocom.org/projects/osmo-remsim/wiki)
+for usage instructions, manual and examples.
+
+
+GIT Repository
+--------------
+
+You can clone from the official osmo-remsim.git repository using
+
+        git clone https://gitea.osmocom.org/sim-card/osmo-remsim
+
+There is a web interface at <https://gitea.osmocom.org/sim-card/osmo-remsim>.
+
+Documentation
+-------------
+
+The User Manual is optionally built in PDF form as part of the build process.
+
+A pre-rendered PDF version of the current `master` can be found at
+User Manual(https://downloads.osmocom.org/docs/latest/osmo-remsim-usermanual.pdf).
+
+
+Forum
+-----
+
+We welcome any osmo-remsim related discussions in the
+SIM Card Technology(https://discourse.osmocom.org/c/sim-card-technology/)
+section of the osmocom discourse (web based Forum).
+
+
+Mailing List
+------------
+
+There is no separate mailing list for this project. However,
+discussions related to pySim are happening on the simtrace
+<simtrace@lists.osmocom.org> mailing list, please see
+<https://lists.osmocom.org/mailman/listinfo/simtrace> for subscription
+options and the list archive.
+
+Please observe the Osmocom Mailing List
+Rules(https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules)
+when posting.
+
+
+Issue Tracker
+-------------
+
+We use the issue tracker of the osmo-remsim project on osmocom.org(https://osmocom.org/projects/osmo-remsim/issues) for
+tracking the state of bug reports and feature requests.  Feel free to submit any issues you may find, or help
+us out by resolving existing issues.
+
+
+Contributing
+------------
+
+Our coding standards are described at
+<https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards>
+
+We are using a gerrit-based patch review process explained at
+<https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit>

osmo-remsim_1.1.0.tar.gz/TODO-RELEASE Added

osmo-remsim_1.0.0.tar.gz/asn1/RSPRO.asn -> osmo-remsim_1.1.0.tar.gz/asn1/RSPRO.asn Changed

osmo-remsim_1.0.0.tar.gz/configure.ac -> osmo-remsim_1.1.0.tar.gz/configure.ac Changed

@@ -33,9 +33,9 @@
 fi
 PKG_PROG_PKG_CONFIG(0.20)
 
-PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.6.0)
-PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0)
-PKG_CHECK_MODULES(OSMOABIS, libosmoabis >= 0.8.0)
+PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.11.0)
+PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 1.11.0)
+PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 1.6.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")
@@ -64,8 +64,8 @@
 	osmo_ac_build_client_st2="$enableval",osmo_ac_build_client_st2="yes")
 if test "$osmo_ac_build_client_st2" = "yes"; then
 	AC_DEFINE(BUILD_CLIENT_ST2, 1, Define if we want to build osmo-remsim-client-st2)
-	PKG_CHECK_MODULES(OSMOUSB, libosmousb >= 1.4.0)
-	PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2 >= 0.8.0)
+	PKG_CHECK_MODULES(OSMOUSB, libosmousb >= 1.11.0)
+	PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2 >= 0.9.0)
 	PKG_CHECK_MODULES(USB, libusb-1.0)
 fi
 AM_CONDITIONAL(BUILD_CLIENT_ST2, test "x$osmo_ac_build_client_st2" = "xyes")
@@ -197,7 +197,6 @@
 	contrib/Makefile
 	contrib/etc_default/Makefile
 	contrib/systemd/Makefile
-	contrib/osmo-remsim.spec
 	doc/Makefile
 	doc/examples/Makefile
 	doc/manuals/Makefile

osmo-remsim_1.0.0.tar.gz/contrib/Makefile.am -> osmo-remsim_1.1.0.tar.gz/contrib/Makefile.am Changed

osmo-remsim_1.0.0.tar.gz/contrib/jenkins.sh -> osmo-remsim_1.1.0.tar.gz/contrib/jenkins.sh Changed

osmo-remsim_1.1.0.tar.gz/contrib/osmo-remsim-apitool Changed

osmo-remsim_1.0.0.tar.gz/contrib/systemd/osmo-remsim-bankd.service -> osmo-remsim_1.1.0.tar.gz/contrib/systemd/osmo-remsim-bankd.service Changed

osmo-remsim_1.0.0.tar.gz/contrib/systemd/osmo-remsim-client@.service -> osmo-remsim_1.1.0.tar.gz/contrib/systemd/osmo-remsim-client@.service Changed

osmo-remsim_1.0.0.tar.gz/contrib/systemd/osmo-remsim-server.service -> osmo-remsim_1.1.0.tar.gz/contrib/systemd/osmo-remsim-server.service Changed

osmo-remsim_1.0.0.tar.gz/debian/changelog -> osmo-remsim_1.1.0.tar.gz/debian/changelog Changed

@@ -1,3 +1,101 @@
+osmo-remsim (1.1.0) unstable; urgency=medium
+
+   Harald Welte 
+  * manual: Document the logging configuration
+  * manual: update remsim-client options to match --help output
+  * manual: Update changelog, copyright, version
+  * Fix client_id/bank_id/slot_nr range in manual + --help output
+  * Check RSPRO component type; print error if type doesn't match
+  * server: Log connection establishment from bankd/client; warn on localhost
+  * server: Log keep-alive timeout and TCP disconnects
+  * server: Differentiate log levels, not everything is DEBUG
+  * bankd: Differentiate log levels, not everything is DEBUG
+  * server: Fix segfault in error path (client component ID != client)
+  * server: Detect duplicate client/bankd connection; drop new ones
+  * bankd: Better error messages during start-up
+  * encode actual hostname in RSPRO
+  * cosmetic: various typo/spelling fixes
+  * server: Fix various error paths if startup fails
+  * bankd: Log more clearly if we fail to open a PC/SC reader
+  * rspro_client_fsm: Log clientConnectResult != ok
+  * update git URLs (git -> https; gitea)
+  * bankd: log BankID:SlotNr in every log line
+  * main_fsm: Log bankd config (ip/port/bank_id/slot_nr) + disconnect
+  * bankd: Log not just ModemToCard but also CardToModem
+  * Install + package remsim-apitool as separate sub-package
+  * debian/control: Don't use misc:Package
+  * fix rpm spec file for packacing of apitool
+  * client: Log TPDU/ATR/PTS/slotStatus at INFO or NOTICE level
+  * bankd: Open PC/SC by default in EXCLUSIVE mode
+  * client: Fix '-a' command-line argument for ATR
+  * client: Option to ignore any ATR sent by bankd
+  * bankd: Don't log an "Error" if slotmap is removed
+  * remsim-client-st2: Proper error if not all endpoints can be found
+  * Fix various 'uninitialized variable' bugs reported by coverity
+  * rest_api: strtoul canot return negative
+  * remsim_server: handle osmo_fd_register() failure case
+  * rspro_server: Handle ipa_server_link_open() error case
+  * bankd_main: Avoid uninitialized variable
+  * rspro_client_fsm: Fix integer overflow calculating re-establishment delay
+  * user_ifdhandler: Fix missing check of osmo_fd_register return val
+  * user_shell: Fix unchecked return value of osmo_fd_register()
+  * user_simtrace2: Fix uninitialized ifm->path
+  * bankd: Don't use 127.0.0.1 as default IP address for the server
+  * README.md: Major update / meaningful content
+  * Add funding link to github mirror
+
+   Oliver Smith 
+  * treewide: remove FSF address
+  * packaging: osmo-remsim-apitool needs py3-requests
+  * debian: set compat level to 10
+  * systemd: depend on networking-online.target
+  * src/rspro: regenerate to fix misleading indents
+  * checkpatch.conf: ignore rspro generated files
+  * debian/rules: don't compress pdfs
+  * contrib: remove rpm spec file
+  * contrib/jenkins: libosmo-abis after libosmo-netif
+
+   James Tavares 
+  * bankd: add missing -p short form option
+  * ignore libtool artifacts from cross-compile environments
+  * bankd: edge detect RESET and VCC indications
+  * client: set the local/remote mode before inserting card
+  * bankd: Add GSMTAP functionality for SIM traffic
+  * bankd, client, server: add -L option to disable log coloring
+  * rspro_client: implement re-establish delay
+
+   Daniel Willmann 
+  * remsim_client: Fix custom ATR '-a' option
+
+   Stephan Skrodzki 
+  * another csv example for our usb CCID reader
+
+   arehbein 
+  * bankd: Use gsmtap_inst_fd2()
+
+   Joey Berkovitz 
+  * user_ifdhandler: Fix segfault on startup
+
+   Alexander Couzens 
+  * remsim_client: add support to set sim presence pin polarity
+
+   Pau Espin Pedrol 
+  * Replace deprecated ipa_msg_push_header()
+  * Fix uninitialized return value
+  * Remove rspro_client.c which is not used anyway
+  * Makefile:am: Improve formatting and order of CFLAGS and LIBS
+  * rspro: use osmo_stream to handle IPA connection
+  * server: Implement IPA server with osmo_stream
+  * Use new osmo_ipa_ka_fsm_inst APIs from libosmo-netif
+  * Drop dependency on libosmo-abis
+  * rspro_client_fsm: Fix missing return
+  * bankd: Fix typo in fprintf string output
+  * cosmetic: rspro_client_fsm: Document event handled in all_state
+  * Several logging improvements
+  * bankd: Add -T and -e cmdline params
+
+ -- Oliver Smith <osmith@sysmocom.de>  Wed, 12 Feb 2025 15:54:41 +0100
+
 osmo-remsim (1.0.0) unstable; urgency=medium
 
    Harald Welte

osmo-remsim_1.0.0.tar.gz/debian/compat -> osmo-remsim_1.1.0.tar.gz/debian/compat Changed

osmo-remsim_1.0.0.tar.gz/debian/control -> osmo-remsim_1.1.0.tar.gz/debian/control Changed

@@ -1,24 +1,24 @@
 Source: osmo-remsim
-Maintainer: Harald Welte <laforge@gnumonks.org>
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Section: net
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                pkg-config,
                dh-autoreconf,
                autotools-dev,
                pkg-config,
                osmo-gsm-manuals-dev,
                libcsv-dev,
-               libosmocore-dev (>= 1.6.0),
-               libosmo-abis-dev,
-               libosmo-simtrace2-dev (>= 0.8.0),
+               libosmocore-dev (>= 1.11.0),
+               libosmo-netif-dev (>= 1.6.0),
+               libosmo-simtrace2-dev (>= 0.9.0),
                libpcsclite-dev,
                libusb-1.0-0-dev,
                libulfius-dev,
                libjansson-dev
 Standards-Version: 3.9.8
-Vcs-Browser: http://git.osmocom.org/osmo-remsim/
-Vcs-Git: git://git.osmocom.org/osmo-remsim
+Vcs-Browser: https://gitea.osmocom.org/sim-card/osmo-remsim
+Vcs-Git: https://gitea.osmocom.org/sim-card/osmo-remsim
 Homepage: https://projects.osmocom.org/projects/osmo-remsim
 
 Package: libosmo-rspro2
@@ -51,6 +51,15 @@
  it maintains a list of clients + bankds connected to it, as well as the
  dynamic SIM card mappings between them.
 
+Package: osmo-remsim-apitool
+Architecture: any
+Multi-Arch: same
+Depends: osmocom-latest, ${misc:Depends}, python3, python3-requests
+Description: Osmocom Remote SIM - API tool for server
+ This is a small python tool for generating API requests to remsim-server,
+ which can be used by the system administrator to introspect and/or modify
+ the state (mostly slotmaps).
+
 Package: osmo-remsim-bankd
 Architecture: any
 Multi-Arch: same
@@ -96,5 +105,5 @@
 Section: doc
 Priority: optional
 Depends: osmocom-latest, ${misc:Depends}
-Description: ${misc:Package} PDF documentation
- User manual for ${misc:Package} in PDF format.
+Description: Osmocom Remote SIM documentation
+ User manual for Osmocom Remote SIM in PDF format.

osmo-remsim_1.0.0.tar.gz/debian/copyright -> osmo-remsim_1.1.0.tar.gz/debian/copyright Changed

osmo-remsim_1.0.0.tar.gz/debian/libosmo-rspro-dev.install -> osmo-remsim_1.1.0.tar.gz/debian/libosmo-rspro-dev.install Changed

osmo-remsim_1.1.0.tar.gz/debian/osmo-remsim-apitool.install Added

osmo-remsim_1.0.0.tar.gz/debian/rules -> osmo-remsim_1.1.0.tar.gz/debian/rules Changed

osmo-remsim_1.1.0.tar.gz/doc/manuals/chapters/logging.adoc Added

@@ -0,0 +1,58 @@
+remsim_logging
+== osmo-remsim logging
+
+All programs within the osmo-remsim project use the logging sub-system of `libosmocore`.
+
+Contrary to the larger Osmocom projects with their own VTY + configuration file, the
+logging configuration for osmo-remsim programs must happen via command line arguments.
+
+Also, contrary to the larger Osmocom projects, only logging to `stderr` is supported;
+no direct logging to log files, syslog, systemd, etc. is supported at this point.
+
+=== `-d` command line argument
+
+Every osmo-remsim program like `osmo-remsim-bankd`, `osmo-remsim-server` or
+`osmo-remsim-client-st2` supports a `-d` command line argument.  This argument
+takes one mandatory parameter configuring the log level for each log sub-system
+as follows:
+
+`-d SUBSYS,num_lvl:SUBSYS,num_lvl:...`
+
+So basically, a colon-separated list of tuples, where each tuple contains the
+sub-system name and the _numeric_ log level.
+
+Below is the list of sub-systems and a table of numerical levels:
+
+.libosmocore log levels and their numeric values
+options="header",width="30%",cols="1,1"
+|===
+|Level name|Numeric value
+|DEBUG|1
+|INFO|3
+|NOTICE|5
+|ERROR|7
+|FATAL|8
+|===
+
+.osmo-remsim log sub-system names and their description
+options="header",width="50%",cols="1,2"
+|===
+|Sub-System Name|Description
+|DMAIN|respective main program code
+|DST2|SIMtrace2 `cardem` firmware interaction via USB
+|DRSPRO|RSPRO protocol between bankd, server and client
+|DREST|REST interface of `osmo-remsim-server`
+|DSLOTMAP|slotmap code shared by `osmo-remsim-server` and `osmo-remsim-bankd`
+|DBANKDW|worker threads of `osmo-remsim-bankd`
+|===
+
+=== Example
+
+Putting the above in a concrete example:
+
+`-d DMAIN,5:DRSPRO,1`
+
+would perform the following configuration:
+
+* log only NOTICE (or higher) messages in the DMAIN subsystem (low verbosity)
+* log DEBUG (or higher) messages in the DRSPRO subsystem (very high verbosity)

osmo-remsim_1.0.0.tar.gz/doc/manuals/chapters/overview.adoc -> osmo-remsim_1.1.0.tar.gz/doc/manuals/chapters/overview.adoc Changed

osmo-remsim_1.0.0.tar.gz/doc/manuals/chapters/remsim-apitool.adoc -> osmo-remsim_1.1.0.tar.gz/doc/manuals/chapters/remsim-apitool.adoc Changed

@@ -1,7 +1,7 @@
 remsim-apitool
-== remsim-apitool.py
+== osmo-remsim-apitool
 
-`remsim-apitool.py` is a small python script whic can be used to manually
+`osmo-remsim-apitool` is a small python script whic can be used to manually
 control `osmo-remsim-server` via its RESTful interface in setups where
 no external back-end application is controlling this interface.
 
@@ -20,37 +20,37 @@
 
 ==== Listing connected clients
 
-The command `remsim-apitool.py -c` can be used to list all currently connected clients.
+The command `osmo-remsim-apitool -c` can be used to list all currently connected clients.
 
 ----
-$ remsim-apitool.py -c
+$ osmo-remsim-apitool -c
 /clients: {'clients': {'peer': 'C23:0', 'state': 'CONNECTED_CLIENT', 'component_id': {'type_': 'remsimClient', 'name': 'nataraja', 'software': 'remsim-client', 'swVersion': '0.2.2.63-844b'}}}
 ----
 
 ==== Listing connected bankds
 
-The command `remsim-apitool.py -b` can be used to list all currently connected bankds.
+The command `osmo-remsim-apitool -b` can be used to list all currently connected bankds.
 
 ----
-$ remsim-apitool.py -b
+$ osmo-remsim-apitool -b
 /banks: {'banks': {'peer': 'B1', 'state': 'CONNECTED_BANKD', 'component_id': {'type_': 'remsimBankd', 'name': 'fixme-name', 'software': 'remsim-bankd', 'swVersion': '0.2.2.46-3598'}, 'bankId': 1, 'numberOfSlots': 5}}
 ----
 
 ==== Listing installed slotmaps
 
-The command `remsim-apitool.py -s` can be used to list all currently installed slotmaps.
+The command `osmo-remsim-apitool -s` can be used to list all currently installed slotmaps.
 
 ----
-$ remsim-apitool.py -s
+$ osmo-remsim-apitool -s
 /slotmaps: {'slotmaps': {'bank': {'bankId': 1, 'slotNr': 1}, 'client': {'clientId': 23, 'slotNr': 0}, 'state': 'ACTIVE'}}
 ----
 
 ==== Listing all information
 
-The command `remsim-apitool.py -a` can be used to list all information (clients, bankds, slotmaps).
+The command `osmo-remsim-apitool -a` can be used to list all information (clients, bankds, slotmaps).
 
 ----
-$ remsim-apitool.py -a
+$ osmo-remsim-apitool -a
 /clients: {'clients': {'peer': 'C23:0', 'state': 'CONNECTED_CLIENT', 'component_id': {'type_': 'remsimClient', 'name': 'nataraja', 'software': 'remsim-client', 'swVersion': '0.2.2.63-844b'}}}
 /banks: {'banks': {'peer': 'B1', 'state': 'CONNECTED_BANKD', 'component_id': {'type_': 'remsimBankd', 'name': 'fixme-name', 'software': 'remsim-bankd', 'swVersion': '0.2.2.46-3598'}, 'bankId': 1, 'numberOfSlots': 5}}
 /slotmaps: {'slotmaps': {'bank': {'bankId': 1, 'slotNr': 1}, 'client': {'clientId': 23, 'slotNr': 0}, 'state': 'ACTIVE'}}
@@ -58,28 +58,28 @@
 
 ==== Creating a slotmap
 
-The command `remsim-apitool.py -m bank_id bankd_slot client_id client_slot` can be used to create a new slotmap.
+The command `osmo-remsim-apitool -m bank_id bankd_slot client_id client_slot` can be used to create a new slotmap.
 
 .Create a slotmap between Bankd 1 Slot a (B1:1) and Client 23 Slot 0 (C23:0)
 ----
-$ remsim-apitool.py -m 1 1 23 0
+$ osmo-remsim-apitool -m 1 1 23 0
 ----
 
 ==== Deleting a slotmap
 
-The command `remsim-apitool.py -d bank_id bank_slot` can be used to create a new slotmap.
+The command `osmo-remsim-apitool -d bank_id bank_slot` can be used to create a new slotmap.
 
 .Remove a slotmap for Bankd 1 Slot a (B1:1)
 ----
-$ remsim-apitool.py -m 1 1
+$ osmo-remsim-apitool -m 1 1
 ----
 
 ==== Reset all state
 
-The command `remsim-apitool.py -r` can be used to reset all state in bankd, including all slotmaps.
+The command `osmo-remsim-apitool -r` can be used to reset all state in bankd, including all slotmaps.
 
 ----
-$ remsim-apitool.py -r
+$ osmo-remsim-apitool -r
 ----
 
 WARNING: Use with extreme caution, particularly in production environments.

osmo-remsim_1.0.0.tar.gz/doc/manuals/chapters/remsim-bankd.adoc -> osmo-remsim_1.1.0.tar.gz/doc/manuals/chapters/remsim-bankd.adoc Changed

@@ -61,30 +61,55 @@
 
 ==== SYNOPSIS
 
-*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> 
+*osmo-remsim-bankd* -h -V -d LOGOPT -i A.B.C.D -p <1-65535> -b <1-1023> -n <1-1023> -I A.B.C.D -P <1-65535> 
 
 ==== OPTIONS
 
 *-h, --help*::
   Print a short help message about the supported options
+*-V, --version*::
+  Print the software version number
+*-d, --debug LOGOPT*::
+  Configure the logging verbosity, see <<remsim_logging>>.
 *-i, --server-host A.B.C.D*::
   Specify the remote IP address/hostname of the `osmo-remsim-server` to
-  which this bankd shall establish its RSPRO control connection
+  which this bankd shall establish its RSPRO control connection.  Do not specify a loopback
+  address or localhost, as this would in most cases result in a broken configuration where
+  a usually remote remsim-client attempts to reach the bankd via loopback, which doesn't work.
 *-p, --server-port <1-65535>*::
   Specify the remote TCP port number of the `osmo-remsim-server` to which
   this bankd shall establish its RSPRO control connection
-*-b, --bank-id <1-65535>*::
+*-b, --bank-id <1-1023>*::
   Specify the numeric bank identifier of the SIM bank this bankd
   instance operates.  Must be unique among all banks connecting to the
   same `osmo-remsim-server`.
-*-n, --num-slots <1-65535>*::
+*-n, --num-slots <1-1023>*::
   Specify the number of slots that this bankd handles.
 *-I, --bind-IP A.B.C.D*::
   Specify the local IP address to which the socket for incoming connections
   from `osmo-remsim-clients` is bound to.
 *-P, --bind-port <1-65535>*::
-  Specify the local TCP port to whicc the socket for incoming connections
+  Specify the local TCP port to which the socket for incoming connections
   from `osmo-remsim-client`s is bound to.
+*-s, --permit-shared-pcsc*::
+  Specify whether the PC/SC readers should be accessed in SCARD_SHARE_SHARED
+  mode, instead of the default (SCARD_SHARE_EXCLUSIVE).  Shared mode would
+  permit multiple application programs to access a single reader/slot/card
+  concurrently.  This is potentially dangerous as the two programs operate
+  without knowledge of each other, and either of them might modify the card
+  state (such as the currently selected file, validated PIN, etc.) in a
+  way not expected by the other application.
+*-g, --gsmtap-ip A.B.C.D*::
+  Enable GSMTAP and send APDU traces to given IP.
+*-G, --gsmtap-slot <0-1023>*::
+  Limit tracing to given bank slot, only (default: all slots).
+*-L, --disable-color*::
+  Disable colors for logging to stderr.
+*-T, --timestamp*::
+  Prefix every log line with a timestamp.
+*-e, --log-level number*::
+  Set a global loglevel for all logging.
+
 
 ==== Examples
 .remsim-server is on 10.2.3.4, cardreader has 5 slots:
@@ -153,3 +178,9 @@
 
 The +0-9\{2\}+ construct exists to perform wildcard matching, no matter which particular two-digit number
 pcscd decides to use.
+
+.Example: CSV file mapping bankd slot 0 to a OMNIKEY 3x21 Smart Card Reader:
+----
+"1","0","HID Global OMNIKEY 3x21 Smart Card Reader \OMNIKEY 3x21 Smart Card Reader\ 00 00"
+----
+

osmo-remsim_1.0.0.tar.gz/doc/manuals/chapters/remsim-client.adoc -> osmo-remsim_1.1.0.tar.gz/doc/manuals/chapters/remsim-client.adoc Changed

@@ -72,27 +72,37 @@
 
 *-h, --help*::
   Print a short help message about the supported options
-*-s, --server-host A.B.C.D*::
+*-V, --version*::
+  Print the software version number
+*-d, --debug LOGOPT*::
+  Configure the logging verbosity, see <<remsim_logging>>.
+*-i, --server-ip A.B.C.D*::
   Specify the remote IP address / hostname of the `osmo-remsim-server` to
   which this client shall establish its RSPRO control connection
 *-p, --server-port <1-65535>*::
   Specify the remote TCP port number of the `osmo-remsim-server` to which
   this client shall establish its RSPRO control connection
-*-c, --client-id <1-65535>*::
+*-c, --client-id <1-1023>*::
   Specify the numeric client identifier of the SIM bank this bankd
   instance operates.  The tuple of client-id and client-slot must be
   unique among all clients connecting to the same `osmo-remsim-server`.
-*-n, --client-slot <0-65535>*::
+*-n, --client-slot <0-1023>*::
   Specify the slot number served within this client.  The tuple of
   client-id and client-slot must be unique among all clients connecting
   to the same `osmo-remsim-server`.
-*-i, --gsmtap-ip A.B.C.D*::
-  Specify the IP address (if any) to which APDU traces are sent in
-  GSMTAP format (useful for debugging; supported by wireshark).
-*-k, --keep-running*::
-  Specify if the `osmo-remsim-client` should terminate after handling one
-  session, or whether it should keep running.  Fast respawn (i.e. no
-  --keep-running) is probably the more robust option at this point.
+*-a, --atr HEXSTRING*::
+  Specify the initial ATR to be communicated to the modem/phone.  Can
+  and will later be overridden by the ATR as specified by
+  `osmo-remsim-bankd` once a card has been mapped to this client, unless
+  the `--atr-ignore-rspro` option is also specified.
+*-r, --atr-ignore-rspro*::
+  Ignore any incoming RSPRO setAtrReq and always only use the locally-specified
+  ATR when communicating with the UE/modem/phone.  This can be used to constrain
+  the capabilities advertised.  This way, for example, the baud rate can be constrained,
+  or the use of logical channels prevented.
+*-e, --event-script COMMAND*::
+  Specify the shell command to be execute when the client wants to call its
+  helper script
 *-V, --usb-vendor*::
   Specify the USB Vendor ID of the USB device served by this client,
   use e.g. 0x1d50 for SIMtrace2, sysmoQMOD and OWHW.
@@ -118,14 +128,6 @@
   usefule to disambiguate between multiple identical USB devices
   attached to the same host.  You don't need this if you have only one
   SIM emulation device attached to your system.
-*-a, --atr HEXSTRING*::
-  Specify the initial ATR to be communicated to the modem/phone.  Can
-  and will later be overridden by the ATR as specified by
-  `osmo-remsim-bankd` once a card has been mapped to this client.
-*-e, --event-script COMMAND*::
-  Specify the shell command to be execute when the client wants to call its
-  helper script
-
 
 ==== Examples
 .remsim-server is on 10.2.3.4, sysmoQMOD on usb bus, all 4 modems:
@@ -220,17 +222,19 @@
   Print a short help message about the supported options
 *-v, --version*::
   Print the compile-time version information
+*-d, --debug LOGOPT*::
+  Configure the logging verbosity, see <<remsim_logging>>.
 *-i, --server-ip A.B.C.D*::
   Specify the remote IP address / hostname of the `osmo-remsim-server` to
   which this client shall establish its RSPRO control connection
 *-p, --server-port <1-65535>*::
   Specify the remote TCP port number of the `osmo-remsim-server` to which
   this client shall establish its RSPRO control connection
-*-c, --client-id <1-65535>*::
+*-c, --client-id <1-1023>*::
   Specify the numeric client identifier of the SIM bank this bankd
   instance operates.  The tuple of client-id and client-slot must be
   unique among all clients connecting to the same `osmo-remsim-server`.
-*-n, --client-slot <0-65535>*::
+*-n, --client-slot <0-1023>*::
   Specify the slot number served within this client.  The tuple of
   client-id and client-slot must be unique among all clients connecting
   to the same `osmo-remsim-server`.

osmo-remsim_1.0.0.tar.gz/doc/manuals/chapters/remsim-server.adoc -> osmo-remsim_1.1.0.tar.gz/doc/manuals/chapters/remsim-server.adoc Changed

osmo-remsim_1.0.0.tar.gz/doc/manuals/osmo-remsim-usermanual-docinfo.xml -> osmo-remsim_1.1.0.tar.gz/doc/manuals/osmo-remsim-usermanual-docinfo.xml Changed

osmo-remsim_1.0.0.tar.gz/doc/manuals/osmo-remsim-usermanual.adoc -> osmo-remsim_1.1.0.tar.gz/doc/manuals/osmo-remsim-usermanual.adoc Changed

osmo-remsim_1.0.0.tar.gz/include/osmocom/rspro/Makefile.am -> osmo-remsim_1.1.0.tar.gz/include/osmocom/rspro/Makefile.am Changed

osmo-remsim_1.0.0.tar.gz/include/osmocom/rspro/ResultCode.h -> osmo-remsim_1.1.0.tar.gz/include/osmocom/rspro/ResultCode.h Changed

osmo-remsim_1.0.0.tar.gz/src/Makefile.am -> osmo-remsim_1.1.0.tar.gz/src/Makefile.am Changed

osmo-remsim_1.0.0.tar.gz/src/asn1c_helpers.h -> osmo-remsim_1.1.0.tar.gz/src/asn1c_helpers.h Changed

osmo-remsim_1.0.0.tar.gz/src/bankd/Makefile.am -> osmo-remsim_1.1.0.tar.gz/src/bankd/Makefile.am Changed

@@ -1,21 +1,34 @@
-AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src \
+AM_CFLAGS = -Wall \
+	    -I$(top_srcdir)/include \
+	    -I$(top_builddir)/include \
+	    -I$(top_srcdir)/src \
 	    -I$(top_srcdir)/include/osmocom/rspro \
-	    $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \
-	    $(PCSC_CFLAGS)
+	    $(OSMONETIF_CFLAGS) \
+	    $(OSMOGSM_CFLAGS) \
+	    $(OSMOCORE_CFLAGS) \
+	    $(PCSC_CFLAGS) \
+	    $(NULL)
 
-noinst_HEADERS = bankd.h internal.h
+noinst_HEADERS = bankd.h internal.h gsmtap.h
 
 bin_PROGRAMS = osmo-remsim-bankd
 noinst_PROGRAMS = pcsc_test
 
 pcsc_test_SOURCES = driver_core.c driver_pcsc.c main.c
-pcsc_test_LDADD = $(OSMOCORE_LIBS) \
-		  $(PCSC_LIBS) $(top_builddir)/src/libosmo-rspro.la
+pcsc_test_LDADD = $(top_builddir)/src/libosmo-rspro.la \
+		  $(OSMOCORE_LIBS) \
+		  $(PCSC_LIBS) \
+		  $(NULL)
 
 osmo_remsim_bankd_SOURCES = ../slotmap.c ../rspro_client_fsm.c ../debug.c \
-			  bankd_main.c bankd_pcsc.c
-osmo_remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
-			  $(PCSC_LIBS) $(CSV_LIBS) $(top_builddir)/src/libosmo-rspro.la
+			  bankd_main.c bankd_pcsc.c gsmtap.c
+osmo_remsim_bankd_LDADD = $(top_builddir)/src/libosmo-rspro.la \
+			  $(OSMONETIF_LIBS) \
+			  $(OSMOGSM_LIBS) \
+			  $(OSMOCORE_LIBS) \
+			  $(PCSC_LIBS) \
+			  $(CSV_LIBS) \
+			  $(NULL)
 
 # as suggested in http://lists.gnu.org/archive/html/automake/2009-03/msg00011.html
 FORCE:

osmo-remsim_1.0.0.tar.gz/src/bankd/bankd.h -> osmo-remsim_1.1.0.tar.gz/src/bankd/bankd.h Changed

osmo-remsim_1.0.0.tar.gz/src/bankd/bankd_main.c -> osmo-remsim_1.1.0.tar.gz/src/bankd/bankd_main.c Changed

@@ -14,10 +14,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 #define _GNU_SOURCE
@@ -36,6 +32,7 @@
 #include <netdb.h>
 
 #include <osmocom/core/socket.h>
+#include <osmocom/core/select.h>
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/logging.h>
 #include <osmocom/core/application.h>
@@ -51,6 +48,7 @@
 #include "rspro_client_fsm.h"
 #include "debug.h"
 #include "rspro_util.h"
+#include "gsmtap.h"
 
 /* signal indicates to worker thread that its map has been deleted */
 #define SIGMAPDEL	SIGRTMIN+1
@@ -63,6 +61,7 @@
 __thread void *talloc_asn1_ctx;
 struct bankd *g_bankd;
 static void *g_tall_ctx;
+static char g_hostname256;
 
 static void *worker_main(void *arg);
 
@@ -85,7 +84,7 @@
 
 	asn_debug = 0;
 
-	/* intialize members of 'bankd' */
+	/* initialize members of 'bankd' */
 	bankd->slotmaps = slotmap_init(bankd);
 	INIT_LLIST_HEAD(&bankd->workers);
 	pthread_mutex_init(&bankd->workers_mutex, NULL);
@@ -95,12 +94,16 @@
 	bankd->srvc.bankd.num_slots = 8;
 
 	bankd->comp_id.type = ComponentType_remsimBankd;
-	OSMO_STRLCPY_ARRAY(bankd->comp_id.name, "fixme-name");
+	OSMO_STRLCPY_ARRAY(bankd->comp_id.name, g_hostname);
 	OSMO_STRLCPY_ARRAY(bankd->comp_id.software, "remsim-bankd");
 	OSMO_STRLCPY_ARRAY(bankd->comp_id.sw_version, PACKAGE_VERSION);
 	/* FIXME: other members of app_comp_id */
 
 	INIT_LLIST_HEAD(&bankd->pcsc_slot_names);
+
+	bankd->cfg.permit_shared_pcsc = false;
+	bankd->cfg.gsmtap_host = NULL;
+	bankd->cfg.gsmtap_slot = -1;
 }
 
 /* create + start a new bankd_worker thread */
@@ -116,6 +119,8 @@
 	worker->bankd = bankd;
 	worker->num = i;
 	worker->ops = &pcsc_driver_ops;
+	worker->last_vccPresent = true; /* allow cold reset should first indication be false */
+	worker->last_resetActive = false; /* allow warm reset should first indication be true */
 
 	/* in the initial state, the worker has no client.fd, bank_slot or pcsc handle yet */
 
@@ -174,10 +179,17 @@
 	struct client_slot cs;
 	RsproPDU_t *resp;
 
-	LOGPFSM(srvc->fi, "Rx RSPRO %s\n", rspro_msgt_name(pdu));
+	LOGPFSML(srvc->fi, LOGL_DEBUG, "Rx RSPRO %s\n", rspro_msgt_name(pdu));
 
 	switch (pdu->msg.present) {
 	case RsproPDUchoice_PR_connectBankRes:
+		if (pdu->msg.choice.connectBankRes.identity.type != ComponentType_remsimServer) {
+			LOGPFSML(srvc->fi, LOGL_ERROR, "Server connection to a ComponentType(%ld) != RemsimServer? "
+				 "Check your IP/Port configuration\n",
+				 pdu->msg.choice.connectBankRes.identity.type);
+			osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_DISCONNECT, NULL);
+			return -1;
+		}
 		/* Store 'identity' of server in srvc->peer_comp_id */
 		rspro_comp_id_retrieve(&srvc->peer_comp_id, &pdu->msg.choice.connectBankRes.identity);
 		osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_CLIENT_CONN_RES, (void *) pdu);
@@ -203,7 +215,7 @@
 					resp = rspro_gen_CreateMappingRes(ResultCode_ok);
 					goto send_resp;
 				} else {
-					LOGPFSM(srvc->fi, "implicitly removing slotmap\n");
+					LOGPFSML(srvc->fi, LOGL_NOTICE, "implicitly removing slotmap\n");
 					bankd_srvc_remove_mapping(map);
 				}
 			}
@@ -240,10 +252,10 @@
 			} else {
 				rspro2client_slot(&cs, &rreq->client);
 				if (!client_slot_equals(&map->client, &cs)) {
-					LOGPFSM(srvc->fi, "ClientId in removeMappingReq != map\n");
+					LOGPFSML(srvc->fi, LOGL_NOTICE, "ClientId in removeMappingReq != map\n");
 					resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap);
 				} else {
-					LOGPFSM(srvc->fi, "removing slotmap\n");
+					LOGPFSML(srvc->fi, LOGL_INFO, "removing slotmap\n");
 					bankd_srvc_remove_mapping(map);
 					resp = rspro_gen_RemoveMappingRes(ResultCode_ok);
 				}
@@ -273,20 +285,26 @@
 	return 0;
 }
 
-static void printf_help()
+static void printf_help(FILE *out)
 {
-	printf(
-"  -h --help			Print this help message\n"
-"  -V --version			Print the version of the program\n"
-"  -d --debug option		Enable debug logging (e.g. DMAIN:DST2)\n"
-"  -i --server-host A.B.C.D	remsim-server IP address (default: 127.0.0.1)\n"
-"  -p --server-port <1-65535>	remsim-server TCP port (default: 9998)\n"
-"  -b --bank-id <1-65535>	Bank Identifier of this SIM bank (default: 1)\n"
-"  -n --num-slots <1-65535>	Number of Slots in this SIM bank (default: 8)\n"
-"  -I --bind-ip A.B.C.D		Local IP address to bind for incoming client\n"
-"				connections (default: INADDR_ANY)\n"
-"  -P --bind-port <1-65535>	Local TCP port to bind for incoming client\n"
-"				connectionss (default: 9999)\n"
+	fprintf(out,
+"  -h --help                    Print this help message\n"
+"  -V --version                 Print the version of the program\n"
+"  -d --debug option            Enable debug logging (e.g. DMAIN:DST2)\n"
+"  -i --server-host A.B.C.D     remsim-server IP address (mandatory)\n"
+"  -p --server-port <1-65535>   remsim-server TCP port (default: 9998)\n"
+"  -b --bank-id <1-1023>        Bank Identifier of this SIM bank (default: 1)\n"
+"  -n --num-slots <1-1023>      Number of Slots in this SIM bank (default: 8)\n"
+"  -I --bind-ip A.B.C.D         Local IP address to bind for incoming client\n"
+"                               connections (default: INADDR_ANY)\n"
+"  -P --bind-port <1-65535>		Local TCP port to bind for incoming client\n"
+"                               connections (default: 9999)\n"
+"  -s --permit-shared-pcsc      Permit SHARED access to PC/SC readers (default: exclusive)\n"
+"  -g --gsmtap-ip A.B.C.D       Enable GSMTAP and send APDU traces to given IP\n"
+"  -G --gsmtap-slot <0-1023>    Limit tracing to given bank slot, only (default: all slots)\n"
+"  -L --disable-color           Disable colors for logging to stderr\n"
+"  -T --timestamp               Prefix every log line with a timestamp\n"
+"  -e --log-level number        Set a global loglevel.\n"
 	      );
 }
 
@@ -308,16 +326,22 @@
 			{ "component-name", 1, 0, 'N' },
 			{ "bind-ip", 1, 0, 'I' },
 			{ "bind-port", 1, 0, 'P' },
+			{ "permit-shared-pcsc", 0, 0, 's' },
+			{ "gsmtap-ip", 1, 0, 'g' },
+			{ "gsmtap-slot", 1, 0, 'G' },
+			{ "disable-color", 0, 0, 'L' },
+			{ "timestamp", 0, 0, 'T' },
+			{ "log-level", 1, 0, 'e' },
 			{ 0, 0, 0, 0 }
 		};
 
-		c = getopt_long(argc, argv, "hVd:i:o:b:n:N:I:P:", long_options, &option_index);
+		c = getopt_long(argc, argv, "hVd:i:p:b:n:N:I:P:sg:G:LTe:", long_options, &option_index);
 		if (c == -1)
 			break;
 
 		switch (c) {
 		case 'h':
-			printf_help();
+			printf_help(stdout);
 			exit(0);
 			break;
 		case 'V':
@@ -348,6 +372,24 @@
 		case 'P':
 			g_bind_port = atoi(optarg);
 			break;
+		case 's':
+			g_bankd->cfg.permit_shared_pcsc = true;
+			break;
+		case 'g':
+			g_bankd->cfg.gsmtap_host = optarg;
+			break;
+		case 'G':
+			g_bankd->cfg.gsmtap_slot = atoi(optarg);
+			break;
+		case 'L':
+			log_set_use_color(osmo_stderr_target, 0);
+			break;
+		case 'T':
+			log_set_print_timestamp(osmo_stderr_target, 1);
+			break;
+		case 'e':
+			log_set_log_level(osmo_stderr_target, atoi(optarg));
+			break;
 		}

osmo-remsim_1.0.0.tar.gz/src/bankd/bankd_pcsc.c -> osmo-remsim_1.1.0.tar.gz/src/bankd/bankd_pcsc.c Changed

@@ -14,10 +14,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 
@@ -131,12 +127,16 @@
 	size_t bytes_read;
 	struct parser_state ps;
 
-	if (csv_init(&p, CSV_APPEND_NULL) != 0)
+	if (csv_init(&p, CSV_APPEND_NULL) != 0) {
+		LOGP(DMAIN, LOGL_FATAL, "Error during csv_init\n");
 		return -1;
+	}
 
 	fp = fopen(csv_file, "rb");
-	if (!fp)
+	if (!fp) {
+		LOGP(DMAIN, LOGL_FATAL, "Error opening %s: %s\n", csv_file, strerror(errno));
 		return -1;
+	}
 
 	parser_state_init(&ps);
 	ps.bankd = bankd;
@@ -184,6 +184,14 @@
 	LOGW((w), text ": OK\n"); \
 }
 
+static DWORD bankd_share_mode(struct bankd *bankd)
+{
+	if (bankd->cfg.permit_shared_pcsc)
+		return SCARD_SHARE_SHARED;
+	else
+		return SCARD_SHARE_EXCLUSIVE;
+}
+
 static int pcsc_get_atr(struct bankd_worker *worker)
 {
 	long rc;
@@ -232,18 +240,24 @@
 		int r = regexec(&compiled_name, p, 0, NULL, 0);
 		if (r == 0) {
 			LOGW(worker, "Attempting to open card/slot '%s'\n", p);
-			rc = SCardConnect(worker->reader.pcsc.hContext, p, SCARD_SHARE_SHARED,
+			rc = SCardConnect(worker->reader.pcsc.hContext, p, bankd_share_mode(worker->bankd),
 					  SCARD_PROTOCOL_T0, &worker->reader.pcsc.hCard,
 					  &dwActiveProtocol);
 			if (rc == SCARD_S_SUCCESS)
 				result = 0;
-			else
+			else {
 				LOGW_PCSC_ERROR(worker, rc, "SCardConnect");
+				goto out_readerfree;
+			}
 			break;
 		}
 		p += strlen(p) + 1;
 	}
 
+	if (result < 0)
+		LOGW(worker, "Error: Cannot find PC/SC reader/slot matching using regex '%s'\n", worker->reader.name);
+
+out_readerfree:
 	SCardFreeMemory(worker->reader.pcsc.hContext, mszReaders);
 
 out_regfree:
@@ -283,7 +297,7 @@
 
 	LOGW(worker, "Resetting card in '%s' (%s)\n", worker->reader.name,
 		cold_reset ? "cold reset" : "warm reset");
-	rc = SCardReconnect(worker->reader.pcsc.hCard, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0,
+	rc = SCardReconnect(worker->reader.pcsc.hCard, bankd_share_mode(worker->bankd), SCARD_PROTOCOL_T0,
 			    cold_reset ? SCARD_UNPOWER_CARD : SCARD_RESET_CARD, &dwActiveProtocol);
 	PCSC_ERROR(worker, rc, "SCardReconnect");

osmo-remsim_1.0.0.tar.gz/src/bankd/driver_core.c -> osmo-remsim_1.1.0.tar.gz/src/bankd/driver_core.c Changed

osmo-remsim_1.0.0.tar.gz/src/bankd/driver_pcsc.c -> osmo-remsim_1.1.0.tar.gz/src/bankd/driver_pcsc.c Changed

osmo-remsim_1.1.0.tar.gz/src/bankd/gsmtap.c Added

@@ -0,0 +1,109 @@
+/* gsmtap - How to encapsulate SIM protocol traces in GSMTAP
+ *
+ * (C) 2016-2019 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/* among other things, bring in GNU-specific strerror_r() */
+#define _GNU_SOURCE
+
+#include <osmocom/core/gsmtap.h>
+#include <osmocom/core/gsmtap_util.h>
+#include <osmocom/core/logging.h>
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/uio.h>
+
+#include "debug.h"
+
+/*! global GSMTAP instance */
+static struct gsmtap_inst *g_gti;
+
+/*! initialize the global GSMTAP instance for SIM traces
+ *
+ * \paramin gsmtap_host Hostname to send GSMTAP packets
+ *
+ * \return 0 on success, non-zero on error
+ */
+int bankd_gsmtap_init(const char *gsmtap_host)
+{
+	if (g_gti)
+		return -EEXIST;
+
+	errno = 0;
+	g_gti = gsmtap_source_init(gsmtap_host, GSMTAP_UDP_PORT, 0);
+	if (!g_gti) {
+		LOGP(DGSMTAP, LOGL_ERROR, "unable to initialize GSMTAP\n");
+		return -EIO;
+	}
+	gsmtap_source_add_sink(g_gti);
+
+	LOGP(DGSMTAP, LOGL_INFO, "initialized GSMTAP to %s\n", gsmtap_host);
+
+	return 0;
+}
+
+/*! Log one APDU via the global GSMTAP instance by concatenating mdm_tpdu and sim_tpdu.
+ *
+ *  \paramin sub_type     GSMTAP sub-type (GSMTAP_SIM_* constant)
+ *  \paramin mdm_tpdu     User-provided buffer with ModemToCard TPDU to log. May be NULL.
+ *  \paramin mdm_tpdu_len Length of ModemToCard TPDU, in bytes.
+ *  \paramin sim_tpdu     User-provided buffer with CardToModem TPDU to log. May be NULL.
+ *  \paramin sim_tpdu_len Length of CardToModem TPDU, in bytes.
+ *
+ *  \return number of bytes sent on success, -1 on failure
+ */
+int bankd_gsmtap_send_apdu(uint8_t sub_type, const uint8_t *mdm_tpdu, unsigned int mdm_tpdu_len,
+	const uint8_t *sim_tpdu, unsigned int sim_tpdu_len)
+{
+	const struct gsmtap_hdr gh = {
+		.version = GSMTAP_VERSION,
+		.hdr_len = sizeof(struct gsmtap_hdr)/4,
+		.type = GSMTAP_TYPE_SIM,
+		.sub_type = sub_type,
+	};
+
+	struct iovec iov3;
+	unsigned int cnt = 0;
+
+	iovcnt.iov_base = (void *)&gh;
+	iovcnt.iov_len = sizeof(gh);
+	cnt++;
+
+	if (mdm_tpdu && mdm_tpdu_len) {
+		iovcnt.iov_base = (void *)mdm_tpdu;
+		iovcnt.iov_len = mdm_tpdu_len;
+		cnt++;
+	}
+
+	if (sim_tpdu && sim_tpdu_len) {
+		iovcnt.iov_base = (void *)sim_tpdu;
+		iovcnt.iov_len = sim_tpdu_len;
+		cnt++;
+	}
+
+	LOGP(DGSMTAP, LOGL_DEBUG, "sending APDU sub_type=%u, mdm_tpdu len=%u, sim_tpdu len=%u, iov cnt=%u\n",
+		sub_type, mdm_tpdu_len, sim_tpdu_len, cnt);
+
+	const int rc = writev(gsmtap_inst_fd2(g_gti), iov, cnt);
+	if (rc < 0) {
+		char errtxt128;
+		LOGP(DGSMTAP, LOGL_ERROR, "writev() failed with errno=%d: %s\n", errno, strerror_r(errno,
+			errtxt, sizeof(errtxt)));
+		return rc;
+	}
+
+	return 0;
+}

osmo-remsim_1.1.0.tar.gz/src/bankd/gsmtap.h Added

osmo-remsim_1.0.0.tar.gz/src/bankd/main.c -> osmo-remsim_1.1.0.tar.gz/src/bankd/main.c Changed

osmo-remsim_1.0.0.tar.gz/src/client/Makefile.am -> osmo-remsim_1.1.0.tar.gz/src/client/Makefile.am Changed

@@ -1,16 +1,25 @@
-AM_CFLAGS = -Wall -I$(top_srcdir)/include -I/$(top_builddir)/include -I$(top_srcdir)/src \
-	    $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \
+AM_CFLAGS = -Wall \
+	    -I$(top_srcdir)/include \
+	    -I/$(top_builddir)/include \
+	    -I$(top_srcdir)/src \
+	    -I$(top_srcdir)/include/osmocom/rspro \
+	    $(OSMONETIF_CFLAGS) \
+	    $(OSMOGSM_CFLAGS) \
+	    $(OSMOCORE_CFLAGS) \
 	    $(PCSC_CFLAGS) $(USB_CFLAGS) \
 	    $(OSMOSIMTRACE2_CFLAGS) \
-	    -I$(top_srcdir)/include/osmocom/rspro
+	    $(NULL)
 
 bin_PROGRAMS = osmo-remsim-client-shell
 
 osmo_remsim_client_shell_SOURCES = user_shell.c remsim_client_main.c \
 				   remsim_client.c main_fsm.c ../rspro_client_fsm.c ../debug.c
 osmo_remsim_client_shell_CFLAGS = $(AM_CFLAGS)
-osmo_remsim_client_shell_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
-		      $(top_builddir)/src/libosmo-rspro.la
+osmo_remsim_client_shell_LDADD = $(top_builddir)/src/libosmo-rspro.la \
+				 $(OSMONETIF_LIBS) \
+				 $(OSMOGSM_LIBS) \
+				 $(OSMOCORE_LIBS) \
+				 $(NULL)
 
 if BUILD_CLIENT_IFDHANDLER
 EXTRA_DIST=PkgInfo osmo-remsim-client-reader_conf.in
@@ -24,20 +33,27 @@
 libifd_remsim_client_la_CFLAGS = $(AM_CFLAGS)
 libifd_remsim_client_la_CPPFLAGS = $(PCSC_CFLAGS)
 libifd_remsim_client_la_LDFLAGS = -no-undefined
-libifd_remsim_client_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
-		      $(top_builddir)/src/libosmo-rspro.la
+libifd_remsim_client_la_LIBADD = $(top_builddir)/src/libosmo-rspro.la \
+				 $(OSMONETIF_LIBS) \
+				 $(OSMOGSM_LIBS) \
+				 $(OSMOCORE_LIBS) \
+				 $(NULL)
 endif
 
 if BUILD_CLIENT_ST2
 bin_PROGRAMS += osmo-remsim-client-st2
 osmo_remsim_client_st2_SOURCES = user_simtrace2.c remsim_client_main.c \
 				 remsim_client.c main_fsm.c ../rspro_client_fsm.c ../debug.c
-osmo_remsim_client_st2_CPPFLAGS = -DUSB_SUPPORT
+osmo_remsim_client_st2_CPPFLAGS = -DUSB_SUPPORT -DSIMTRACE_SUPPORT
 osmo_remsim_client_st2_CFLAGS = $(AM_CFLAGS)
-osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
-			       $(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \
+osmo_remsim_client_st2_LDADD = $(top_builddir)/src/libosmo-rspro.la \
+			       $(OSMONETIF_LIBS) \
+			       $(OSMOSIMTRACE2_LIBS) \
+			       $(OSMOGSM_LIBS) \
+			       $(OSMOCORE_LIBS) \
+			       $(OSMOUSB_LIBS) \
 			       $(USB_LIBS) \
-			       $(top_builddir)/src/libosmo-rspro.la
+			       $(NULL)
 endif
 
-noinst_HEADERS = client.h 
+noinst_HEADERS = client.h

osmo-remsim_1.0.0.tar.gz/src/client/client.h -> osmo-remsim_1.1.0.tar.gz/src/client/client.h Changed

osmo-remsim_1.0.0.tar.gz/src/client/main_fsm.c -> osmo-remsim_1.1.0.tar.gz/src/client/main_fsm.c Changed

@@ -14,10 +14,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 #include <stdint.h>
@@ -74,7 +70,7 @@
 
 	envi++ = talloc_asprintf(env, "REMSIM_CAUSE=%s", cause);
 
-	/* ask frontend to append any frontend-speccific additional environment vars */
+	/* ask frontend to append any frontend-specific additional environment vars */
 	rc = frontend_append_script_env(bc, env, i, 256-i-1);
 	if (rc > 0)
 		i = rc;
@@ -192,10 +188,6 @@
 {
 	struct bankd_client *bc = (struct bankd_client *) fi->priv;
 
-	/* Simulate card-insert to modem */
-	frontend_request_card_insert(bc);
-	call_script(bc, "request-card-insert");
-
 	/* Select remote (forwarded) SIM */
 	frontend_request_sim_remote(bc);
 	call_script(bc, "request-sim-remote");
@@ -203,6 +195,10 @@
 	/* Set the ATR */
 	frontend_handle_set_atr(bc, bc->cfg->atr.data, bc->cfg->atr.len);
 
+	/* Simulate card insertion to modem */
+	frontend_request_card_insert(bc);
+	call_script(bc, "request-card-insert");
+
 	/* Reset the modem */
 	frontend_request_modem_reset(bc);
 	call_script(bc, "request-modem-reset");
@@ -234,9 +230,11 @@
 	RsproPDU_t *pdu_rx = NULL;
 	RsproPDU_t *resp;
 	BankSlot_t bslot;
+	SlotPhysStatus_t *phys_status;
 
 	switch (event) {
 	case MF_E_BANKD_LOST:
+		LOGPFSML(fi, LOGL_ERROR, "Connection to bankd lost\n");
 		osmo_fsm_inst_state_chg(fi, MF_ST_WAIT_BANKD, 0, 0);
 		break;
 	case MF_E_SRVC_CONFIG_BANK:
@@ -248,6 +246,8 @@
 					   rspro_IpAddr2str(&pdu_rx->msg.choice.configClientBankReq.bankd.ip));
 		bc->bankd_conn.server_port = pdu_rx->msg.choice.configClientBankReq.bankd.port;
 		rspro2bank_slot(&bc->bankd_slot, &pdu_rx->msg.choice.configClientBankReq.bankSlot);
+		LOGPFSML(fi, LOGL_INFO, "Rx configClientBankReq(%s:%u / B%u:%u)\n", bc->bankd_conn.server_host,
+			 bc->bankd_conn.server_port, bc->bankd_slot.bank_id, bc->bankd_slot.slot_nr);
 		/* bankd port 0 is a magic value to indicate "no bankd" */
 		if (bc->bankd_conn.server_port == 0)
 			osmo_fsm_inst_state_chg(fi, MF_ST_UNCONFIGURED, 0, 0);
@@ -265,6 +265,9 @@
 		pdu_rx = data;
 		OSMO_ASSERT(pdu_rx);
 		OSMO_ASSERT(pdu_rx->msg.present == RsproPDUchoice_PR_tpduCardToModem);
+		LOGPFSML(fi, LOGL_NOTICE, "Rx tpduCardToModem(%s)\n",
+			 osmo_hexdump_nospc(pdu_rx->msg.choice.tpduCardToModem.data.buf,
+					    pdu_rx->msg.choice.tpduCardToModem.data.size));
 		/* forward to modem/cardem (via API) */
 		frontend_handle_card2modem(bc, pdu_rx->msg.choice.tpduCardToModem.data.buf,
 					   pdu_rx->msg.choice.tpduCardToModem.data.size);
@@ -274,9 +277,16 @@
 		pdu_rx = data;
 		OSMO_ASSERT(pdu_rx);
 		OSMO_ASSERT(pdu_rx->msg.present == RsproPDUchoice_PR_setAtrReq);
-		/* forward to modem/cardem (via API) */
-		frontend_handle_set_atr(bc, pdu_rx->msg.choice.setAtrReq.atr.buf,
-					pdu_rx->msg.choice.setAtrReq.atr.size);
+		LOGPFSML(fi, LOGL_NOTICE, "Rx setAtrReq(%s)\n",
+			 osmo_hexdump_nospc(pdu_rx->msg.choice.setAtrReq.atr.buf,
+					    pdu_rx->msg.choice.setAtrReq.atr.size));
+		if (bc->cfg->atr_ignore_rspro) {
+			LOGPFSML(fi, LOGL_NOTICE, "Ignoring RSPRO setAtrReq\n");
+		} else {
+			/* forward to modem/cardem (via API) */
+			frontend_handle_set_atr(bc, pdu_rx->msg.choice.setAtrReq.atr.buf,
+						pdu_rx->msg.choice.setAtrReq.atr.size);
+		}
 		/* send response to bankd */
 		resp = rspro_gen_SetAtrRes(ResultCode_ok);
 		server_conn_send_rspro(&bc->bankd_conn, resp);
@@ -285,12 +295,21 @@
 		pdu_rx = data;
 		OSMO_ASSERT(pdu_rx);
 		OSMO_ASSERT(pdu_rx->msg.present == RsproPDUchoice_PR_bankSlotStatusInd);
+		phys_status = &pdu_rx->msg.choice.bankSlotStatusInd.slotPhysStatus;
+		LOGPFSML(fi, LOGL_NOTICE, "Rx bankSlotStatusInd(reset_act=%d, vcc_act=%d, clk_act=%d, "
+			 "card_pres=%d)\n", phys_status->resetActive,
+			 phys_status->vccPresent ? *phys_status->vccPresent : -1,
+			 phys_status->clkActive ? *phys_status->clkActive : -1,
+			 phys_status->cardPresent ? *phys_status->cardPresent : -1);
 		/* forward to modem/cardem (via API) */
 		frontend_handle_slot_status(bc, &pdu_rx->msg.choice.bankSlotStatusInd.slotPhysStatus);
 		break;
 	case MF_E_MDM_STATUS_IND:
 		pstatus = data;
 		OSMO_ASSERT(pstatus);
+		LOGPFSML(fi, LOGL_NOTICE, "Tx clientSlotStatusInd(reset_act=%d, vcc_act=%d, clk_act=%d, "
+			 "card_pres=%d)\n", pstatus->flags.reset_active, pstatus->flags.vcc_present,
+			 pstatus->flags.clk_active, pstatus->flags.card_present);
 		/* forward to bankd */
 		bank_slot2rspro(&bslot, &bc->bankd_slot);
 		resp = rspro_gen_ClientSlotStatusInd(bc->srv_conn.clslot, &bslot,
@@ -306,11 +325,13 @@
 	case MF_E_MDM_PTS_IND:
 		pts = data;
 		OSMO_ASSERT(pts);
+		LOGPFSML(fi, LOGL_NOTICE, "PTS Indication (%s)\n", osmo_hexdump_nospc(pts->buf, pts->len));
 		/* forward to bankd? */
 		break;
 	case MF_E_MDM_TPDU:
 		tpdu = data;
 		OSMO_ASSERT(tpdu);
+		LOGPFSML(fi, LOGL_INFO, "Tx tpduModemToCard (%s)\n", osmo_hexdump_nospc(tpdu->buf, tpdu->len));
 		/* forward to bankd */
 		bank_slot2rspro(&bslot, &bc->bankd_slot);
 		resp = rspro_gen_TpduModem2Card(bc->srv_conn.clslot, &bslot, tpdu->buf, tpdu->len);

osmo-remsim_1.0.0.tar.gz/src/client/remsim_client.c -> osmo-remsim_1.1.0.tar.gz/src/client/remsim_client.c Changed

@@ -14,10 +14,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 /* This file contains code shared among all remsim client applications,
@@ -61,6 +57,7 @@
 	cfg->atr.data0 = 0x3B;
 	cfg->atr.data1 = 0x00; // the shortest simplest ATR possible
 	cfg->atr.len = 2;
+	cfg->atr_ignore_rspro = false;
 
 	return cfg;
 };
@@ -71,6 +68,13 @@
 
 	switch (pdu->msg.present) {
 	case RsproPDUchoice_PR_connectClientRes:
+		if (pdu->msg.choice.connectClientRes.identity.type != ComponentType_remsimBankd) {
+			LOGPFSML(bankdc->fi, LOGL_ERROR, "Server connection to a ComponentType(%ld) != RemsimBankd? "
+				 "Check your IP/Port configuration\n",
+				 pdu->msg.choice.connectClientRes.identity.type);
+			osmo_fsm_inst_dispatch(bankdc->fi, SRVC_E_DISCONNECT, NULL);
+			return -1;
+		}
 		/* Store 'identity' of bankd to in peer_comp_id */
 		rspro_comp_id_retrieve(&bankdc->peer_comp_id, &pdu->msg.choice.connectClientRes.identity);
 		osmo_fsm_inst_dispatch(bankdc->fi, SRVC_E_CLIENT_CONN_RES, (void *) pdu);
@@ -98,6 +102,13 @@
 
 	switch (pdu->msg.present) {
 	case RsproPDUchoice_PR_connectClientRes:
+		if (pdu->msg.choice.connectClientRes.identity.type != ComponentType_remsimServer) {
+			LOGPFSML(srvc->fi, LOGL_ERROR, "Server connection to a ComponentType(%ld) != RemsimServer? "
+				 "Check your IP/Port configuration\n",
+				 pdu->msg.choice.connectClientRes.identity.type);
+			osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_DISCONNECT, NULL);
+			return -1;
+		}
 		/* Store 'identity' of server in srvc->peer_comp_id */
 		rspro_comp_id_retrieve(&srvc->peer_comp_id, &pdu->msg.choice.connectClientRes.identity);
 		osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_CLIENT_CONN_RES, (void *) pdu);

osmo-remsim_1.0.0.tar.gz/src/client/remsim_client_main.c -> osmo-remsim_1.1.0.tar.gz/src/client/remsim_client_main.c Changed

@@ -30,9 +30,15 @@
 		"  -d --debug option          Enable debug logging (e.g. DMAIN:DST2)\n"
 		"  -i --server-ip A.B.C.D     remsim-server IP address\n"
 		"  -p --server-port 13245     remsim-server TCP port\n"
-		"  -c --client-id <0-65535>   RSPRO ClientId of this client\n"
-		"  -n --client-slot <0-65535> RSPRO SlotNr of this client\n"
+		"  -c --client-id <0-1023>    RSPRO ClientId of this client\n"
+		"  -n --client-slot <0-1023>  RSPRO SlotNr of this client\n"
+		"  -a --atr HEXSTRING         default ATR to simulate (until bankd overrides it)\n"
+		"  -r --atr-ignore-rspro      Ignore any ATR from bankd; use only ATR given by -a)\n"
 		"  -e --event-script <path>   event script to be called by client\n"
+		"  -L --disable-color         Disable colors for logging to stderr\n"
+#ifdef SIMTRACE_SUPPORT
+		"  -Z --set-sim-presence <0-1> Define the presence pin behaviour (only supported on some boards)\n"
+#endif
 #ifdef USB_SUPPORT
 		"  -V --usb-vendor VENDOR_ID\n"
 		"  -P --usb-product PRODUCT_ID\n"
@@ -60,7 +66,9 @@
 			{ "client-id", 1, 0, 'c' },
 			{ "client-slot", 1, 0, 'n' },
 			{ "atr", 1, 0, 'a' },
+			{ "atr-ignore-rspro", 0, 0, 'r' },
 			{ "event-script", 1, 0, 'e' },
+			{" disable-color", 0, 0, 'L' },
 #ifdef USB_SUPPORT
 			{ "usb-vendor", 1, 0, 'V' },
 			{ "usb-product", 1, 0, 'P' },
@@ -73,7 +81,10 @@
 			{ 0, 0, 0, 0 }
 		};
 
-		c = getopt_long(argc, argv, "hvd:i:p:c:n:e:"
+		c = getopt_long(argc, argv, "hvd:i:p:c:n:a:re:L"
+#ifdef SIMTRACE_SUPPORT
+						"Z:"
+#endif
 #ifdef USB_SUPPORT
 						"V:P:C:I:S:A:H:"
 #endif
@@ -112,10 +123,23 @@
 				fprintf(stderr, "ATR malformed\n");
 				exit(2);
 			}
+			cfg->atr.len = rc;
+			break;
+		case 'r':
+			cfg->atr_ignore_rspro = true;
 			break;
 		case 'e':
 			osmo_talloc_replace_string(cfg, &cfg->event_script, optarg);
 			break;
+		case 'L':
+			log_set_use_color(osmo_stderr_target, 0);
+			break;
+#ifdef SIMTRACE_SUPPORT
+		case 'Z':
+			cfg->simtrace.presence_valid = true;
+			cfg->simtrace.presence_pol = atoi(optarg);
+			break;
+#endif
 #ifdef USB_SUPPORT
 		case 'V':
 			cfg->usb.vendor_id = strtol(optarg, NULL, 16);

osmo-remsim_1.0.0.tar.gz/src/client/user_ifdhandler.c -> osmo-remsim_1.1.0.tar.gz/src/client/user_ifdhandler.c Changed

@@ -14,10 +14,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 /* This is a remsim-client that provides an IFD_Handler (reader driver)
@@ -115,7 +111,7 @@
 void __thread *talloc_asn1_ctx;
 
 struct client_thread {
-	/* bankd client runningi inside this thread */
+	/* bankd client running inside this thread */
 	struct bankd_client *bc;
 
 	/* inter-thread osmo-fd; communication with IFD/PCSC thread */
@@ -129,7 +125,6 @@
 
 /* configuration of client thread; passed in from IFD thread */
 struct client_thread_cfg {
-	const char *name;
 	const char *server_host;
 	int server_port;
 	int client_id;
@@ -137,7 +132,7 @@
 	int it_sock_fd;
 };
 
-/* enqueue a msgb (containg 'struct itmsg') towards the IFD-handler thread */
+/* enqueue a msgb (containing 'struct itmsg') towards the IFD-handler thread */
 static void enqueue_to_ifd(struct client_thread *ct, struct msgb *msg)
 {
 	if (!msg)
@@ -371,11 +366,15 @@
 	struct client_thread_cfg *cfg = arg;
 	struct client_config *ccfg;
 	struct client_thread *ct;
+	char hostname256;
 	int rc;
 
-	osmo_select_init();
+	if (gethostname(hostname, sizeof(hostname)) < 0)
+		OSMO_STRLCPY_ARRAY(hostname, "unknown");
+
 	rc = osmo_ctx_init("client");
 	OSMO_ASSERT(rc == 0);
+	osmo_select_init();
 
 	ct = talloc_zero(OTC_GLOBAL, struct client_thread);
 	OSMO_ASSERT(ct);
@@ -391,13 +390,14 @@
 	if (!talloc_asn1_ctx)
 	       talloc_asn1_ctx= talloc_named_const(ct, 0, "asn1");
 
-	ct->bc = remsim_client_create(ct, cfg->name, "remsim_ifdhandler", ccfg);
+	ct->bc = remsim_client_create(ct, hostname, "remsim_ifdhandler", ccfg);
 	OSMO_ASSERT(ct->bc);
 	ct->bc->data = ct;
 
 	INIT_LLIST_HEAD(&ct->it_msgq);
 	osmo_fd_setup(&ct->it_ofd, cfg->it_sock_fd, OSMO_FD_READ, &it_sock_fd_cb, ct, 0);
-	osmo_fd_register(&ct->it_ofd);
+	rc = osmo_fd_register(&ct->it_ofd);
+	OSMO_ASSERT(rc == 0);
 
 	/* ensure we get properly cleaned up if cancelled */
 	pthread_cleanup_push(client_pthread_cleanup, ct);
@@ -564,7 +564,6 @@
 {
 	struct ifd_client *ic;
 	struct client_thread_cfg cfg = {
-		.name = "fixme-name",
 		.server_host = "127.0.0.1",
 		.server_port = -1,
 		.client_id = 0,

osmo-remsim_1.0.0.tar.gz/src/client/user_shell.c -> osmo-remsim_1.1.0.tar.gz/src/client/user_shell.c Changed

osmo-remsim_1.0.0.tar.gz/src/client/user_simtrace2.c -> osmo-remsim_1.1.0.tar.gz/src/client/user_simtrace2.c Changed

@@ -14,10 +14,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 #include <stdio.h>
@@ -26,6 +22,7 @@
 #include <libusb.h>
 
 #include <osmocom/core/fsm.h>
+#include <osmocom/core/select.h>
 #include <osmocom/core/utils.h>
 
 #include <osmocom/usb/libusb.h>
@@ -147,6 +144,7 @@
 		break;
 	case SIMTRACE_MSGT_BD_CEMU_CONFIG:
 		/* firmware confirms configuration change; ignore */
+		rc = 0;
 		break;
 	default:
 		LOGCI(ci, LOGL_ERROR, "unknown simtrace msg type 0x%02x\n", sh->msg_type);
@@ -400,6 +398,7 @@
 	struct osmo_st2_transport *transp;
 	struct osmo_st2_cardem_inst *ci;
 	struct client_config *cfg = bc->cfg;
+	struct cardemu_usb_msg_config cardem_config = { .features = CEMU_FEAT_F_STATUS_IRQ };
 	int rc, i;
 
 	rc = osmo_libusb_init(NULL);
@@ -415,6 +414,7 @@
 	ci->priv = bc;
 	bc->cardem = ci;
 
+	memset(ifm, 0, sizeof(*ifm));
 	ifm->vendor = cfg->usb.vendor_id;
 	ifm->product = cfg->usb.product_id;
 	ifm->configuration = cfg->usb.config_id;
@@ -448,13 +448,23 @@
 		goto close_exit;
 	}
 
+	if (!transp->usb_ep.in || !transp->usb_ep.out || !transp->usb_ep.irq_in) {
+		LOGP(DMAIN, LOGL_ERROR, "specified USB dev/config/interface doesn't have "
+		     "at least one IN, OUT and IRQ_IN endpoint\n");
+		goto close_exit;
+	}
+
 	allocate_and_submit_irq(ci);
 	/* submit multiple IN URB in order to work around OS#4409 */
 	for (i = 0; i < 4; i++)
 		allocate_and_submit_in(ci);
 
-	/* request firmware to generate STATUS on IRQ endpoint */
-	osmo_st2_cardem_request_config(ci, CEMU_FEAT_F_STATUS_IRQ);
+	/* request firmware to generate STATUS on IRQ endpoint, set presence polarity */
+	if (cfg->simtrace.presence_valid) {
+		cardem_config.pres_pol = cfg->simtrace.presence_pol ? CEMU_CONFIG_PRES_POL_PRES_H : 0;
+		cardem_config.pres_pol |= CEMU_CONFIG_PRES_POL_VALID;
+	}
+	osmo_st2_cardem_request_config2(ci, &cardem_config);
 
 	while (1) {
 		osmo_select_main(0);

osmo-remsim_1.0.0.tar.gz/src/debug.c -> osmo-remsim_1.1.0.tar.gz/src/debug.c Changed

osmo-remsim_1.0.0.tar.gz/src/debug.h -> osmo-remsim_1.1.0.tar.gz/src/debug.h Changed

osmo-remsim_1.0.0.tar.gz/src/rspro/INTEGER.c -> osmo-remsim_1.1.0.tar.gz/src/rspro/INTEGER.c Changed

osmo-remsim_1.0.0.tar.gz/src/rspro/ResetStateReq.c -> osmo-remsim_1.1.0.tar.gz/src/rspro/ResetStateReq.c Changed

osmo-remsim_1.0.0.tar.gz/src/rspro/ResetStateRes.c -> osmo-remsim_1.1.0.tar.gz/src/rspro/ResetStateRes.c Changed

osmo-remsim_1.0.0.tar.gz/src/rspro/ResultCode.c -> osmo-remsim_1.1.0.tar.gz/src/rspro/ResultCode.c Changed

@@ -89,15 +89,17 @@
 	{ 3,	13,	"illegalSlotId" },
 	{ 4,	26,	"unsupportedProtocolVersion" },
 	{ 5,	14,	"unknownSlotmap" },
+	{ 6,	13,	"identityInUse" },
 	{ 100,	14,	"cardNotPresent" },
 	{ 101,	16,	"cardUnresponsive" },
 	{ 102,	21,	"cardTransmissionError" }
 	/* This list is extensible */
 };
 static const unsigned int asn_MAP_ResultCode_enum2value_1 = {
-	6,	/* cardNotPresent(100) */
-	8,	/* cardTransmissionError(102) */
-	7,	/* cardUnresponsive(101) */
+	7,	/* cardNotPresent(100) */
+	9,	/* cardTransmissionError(102) */
+	8,	/* cardUnresponsive(101) */
+	6,	/* identityInUse(6) */
 	2,	/* illegalBankId(2) */
 	1,	/* illegalClientId(1) */
 	3,	/* illegalSlotId(3) */
@@ -109,8 +111,8 @@
 static const asn_INTEGER_specifics_t asn_SPC_ResultCode_specs_1 = {
 	asn_MAP_ResultCode_value2enum_1,	/* "tag" => N; sorted by tag */
 	asn_MAP_ResultCode_enum2value_1,	/* N => "tag"; sorted by N */
-	9,	/* Number of elements in the maps */
-	10,	/* Extensions before this member */
+	10,	/* Number of elements in the maps */
+	11,	/* Extensions before this member */
 	1,	/* Strict enumeration */
 	0,	/* Native long size */
 	0

osmo-remsim_1.0.0.tar.gz/src/rspro/constr_CHOICE.c -> osmo-remsim_1.1.0.tar.gz/src/rspro/constr_CHOICE.c Changed

osmo-remsim_1.0.0.tar.gz/src/rspro/per_decoder.c -> osmo-remsim_1.1.0.tar.gz/src/rspro/per_decoder.c Changed

osmo-remsim_1.0.0.tar.gz/src/rspro_client_fsm.c -> osmo-remsim_1.1.0.tar.gz/src/rspro_client_fsm.c Changed

@@ -14,28 +14,27 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include <talloc.h>
 
 #include <osmocom/core/logging.h>
+#include <osmocom/core/select.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/fsm.h>
-
-#include <osmocom/abis/ipa.h>
 #include <osmocom/gsm/protocol/ipaccess.h>
+#include <osmocom/netif/stream.h>
+#include <osmocom/netif/ipa.h>
 
 #include "debug.h"
+#include "asn1c_helpers.h"
 #include "rspro_client_fsm.h"
 
 #define S(x)	(1 << (x))
@@ -43,6 +42,25 @@
 #define T1_WAIT_CLIENT_CONN_RES		10
 #define T2_RECONNECT			10
 
+static const int k_reestablish_delay_s = {
+	0, 0, 0,                            // 3 immediate retries
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,       // 1 Hz for 30 seconds
+	2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2, 2, 2,       // 1/2 hz for 1 minute
+	4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       // 1/4 Hz for 2 minutes
+	8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	8, 8, 8, 8, 8, 8, 8, 8, 8, 8,       // 1/8 Hz for 4 minutes
+	16,                                 // 1/16 Hz thereafter
+};
+
+#define REESTABLISH_DELAY_COUNT ARRAY_SIZE(k_reestablish_delay_s)
+
 /***********************************************************************
  * client-side FSM for a RSPRO connection to remsim-server
  *
@@ -56,15 +74,15 @@
  * remsim-bankd for their RSPRO control connection to remsim-server.
  ***********************************************************************/
 
-static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx)
+static void push_and_send(struct osmo_stream_cli *cli, struct msgb *msg_tx)
 {
 	ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO);
-	ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO);
-	ipa_client_conn_send(ipa, msg_tx);
+	ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO);
+	osmo_stream_cli_send(cli, msg_tx);
 	/* msg_tx is now queued and will be freed. */
 }
 
-static int ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro)
+static int cli_conn_send_rspro(struct osmo_stream_cli *cli, RsproPDU_t *rspro)
 {
 	struct msgb *msg = rspro_enc_msg(rspro);
 	if (!msg) {
@@ -73,14 +91,14 @@
 		ASN_STRUCT_FREE(asn_DEF_RsproPDU, rspro);
 		return -1;
 	}
-	push_and_send(ipa, msg);
+	push_and_send(cli, msg);
 	return 0;
 }
 
 static int _server_conn_send_rspro(struct rspro_server_conn *srvc, RsproPDU_t *rspro)
 {
 	LOGPFSML(srvc->fi, LOGL_DEBUG, "Tx RSPRO %s\n", rspro_msgt_name(rspro));
-	return ipa_client_conn_send_rspro(srvc->conn, rspro);
+	return cli_conn_send_rspro(srvc->conn, rspro);
 }
 
 int server_conn_send_rspro(struct rspro_server_conn *srvc, RsproPDU_t *rspro)
@@ -98,13 +116,15 @@
 }
 
 enum server_conn_fsm_state {
-	/* waiting for initial connectiong to remsim-server */
+	/* waiting for initial connection to remsim-server */
 	SRVC_ST_INIT,
 	/* server connection established, waiting for ClientConnectRes */
 	SRVC_ST_ESTABLISHED,
-	/* server connection etsablished, ClientConnect succeeded */
+	/* server connection established, ClientConnect succeeded */
 	SRVC_ST_CONNECTED,
-	/* connection lost, we're waiting for a re-establish */
+	/* connection lost, 1st step: delaying until we re-establish */
+	SRVC_ST_REESTABLISH_DELAY,
+	/* connection lost, 2nd step: wait for a re-establish */
 	SRVC_ST_REESTABLISH,
 };
 
@@ -114,43 +134,115 @@
 	OSMO_VALUE_STRING(SRVC_E_TCP_UP),
 	OSMO_VALUE_STRING(SRVC_E_TCP_DOWN),
 	OSMO_VALUE_STRING(SRVC_E_KA_TIMEOUT),
-	OSMO_VALUE_STRING(SRVC_E_KA_TERMINATED),
 	OSMO_VALUE_STRING(SRVC_E_CLIENT_CONN_RES),
 	OSMO_VALUE_STRING(SRVC_E_RSPRO_TX),
 	{ 0, NULL }
 };
 
-static void srvc_updown_cb(struct ipa_client_conn *conn, int up)
+static int srvc_connect_cb(struct osmo_stream_cli *cli)
+{
+	struct rspro_server_conn *srvc = osmo_stream_cli_get_data(cli);
+	LOGPFSML(srvc->fi, LOGL_NOTICE, "RSPRO link to %s:%d UP\n", srvc->server_host, srvc->server_port);
+	osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_TCP_UP, 0);
+	return 0;
+}
+
+static int srvc_disconnect_cb(struct osmo_stream_cli *cli)
+{
+	struct rspro_server_conn *srvc = osmo_stream_cli_get_data(cli);
+
+	LOGPFSML(srvc->fi, LOGL_NOTICE, "RSPRO link to %s:%d DOWN\n", srvc->server_host, srvc->server_port);
+
+	if (srvc->ka_fi) {
+		osmo_ipa_ka_fsm_stop(srvc->ka_fi);
+		osmo_ipa_ka_fsm_free(srvc->ka_fi);
+		srvc->ka_fi = NULL;
+	}
+
+	osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_TCP_DOWN, 0);
+	return 0;
+}
+
+static struct msgb *ipa_bts_id_ack(void)
 {
-	struct rspro_server_conn *srvc = conn->data;
+	struct msgb *nmsg2;
+	nmsg2 = ipa_msg_alloc(0);
+	if (!nmsg2)
+		return NULL;
+	msgb_v_put(nmsg2, IPAC_MSGT_ID_ACK);
+	ipa_prepend_header(nmsg2, IPAC_PROTO_IPACCESS);
+	return nmsg2;
+}
+
+static int _ipaccess_bts_handle_ccm(struct osmo_stream_cli *cli, struct rspro_server_conn *srvc, struct msgb *msg)
+{
+	/* special handling for IPA CCM. */
+	if (osmo_ipa_msgb_cb_proto(msg) != IPAC_PROTO_IPACCESS)
+		return 0;
+
+	int ret = 0;
+	const uint8_t *data = msgb_l2(msg);
+	int len = msgb_l2len(msg);
+	OSMO_ASSERT(len > 0);
+	uint8_t msg_type = *data;
+
+	/* ping, pong and acknowledgment cases. */
+	struct osmo_fd tmp_ofd = { .fd = osmo_stream_cli_get_fd(cli) };
+	OSMO_ASSERT(tmp_ofd.fd >= 0);
+	ret = ipa_ccm_rcvmsg_bts_base(msg, &tmp_ofd);
+	if (ret < 0)
+		goto err;
+
+	/* this is a request for identification from the BSC. */
+	if (msg_type == IPAC_MSGT_ID_GET) {
+		struct msgb *rmsg;
+		LOGPFSML(srvc->fi, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n",
+			 srvc->ipa_dev.site_id, srvc->ipa_dev.bts_id, srvc->ipa_dev.trx_id);
+		rmsg = ipa_ccm_make_id_resp_from_req(&srvc->ipa_dev, data + 1, len - 1);
+		if (!rmsg) {
+			LOGPFSML(srvc->fi, LOGL_ERROR, "Failed parsing ID_GET message.\n");
+			goto err;
+		}
+		osmo_stream_cli_send(cli, rmsg);
 
-	LOGPFSML(srvc->fi, LOGL_NOTICE, "RSPRO link to %s:%d %s\n",
-		 conn->addr, conn->port, up ? "UP" : "DOWN");
+		/* send ID_ACK. */
+		rmsg = ipa_bts_id_ack();
+		if (!rmsg) {
+			LOGPFSML(srvc->fi, LOGL_ERROR, "Failed allocating ID_ACK message.\n");

osmo-remsim_1.0.0.tar.gz/src/rspro_client_fsm.h -> osmo-remsim_1.1.0.tar.gz/src/rspro_client_fsm.h Changed

@@ -1,7 +1,8 @@
 #pragma once
 
 #include <osmocom/core/fsm.h>
-#include <osmocom/abis/ipa.h>
+#include <osmocom/gsm/ipa.h>
+#include <osmocom/netif/stream.h>
 #include <osmocom/rspro/RsproPDU.h>
 
 #include "rspro_util.h"
@@ -12,20 +13,24 @@
 	SRVC_E_TCP_UP,
 	SRVC_E_TCP_DOWN,
 	SRVC_E_KA_TIMEOUT,
-	SRVC_E_KA_TERMINATED,
 	SRVC_E_CLIENT_CONN_RES,
 	SRVC_E_RSPRO_TX		/* transmit a RSPRO PDU to the peer */
 };
 
-struct rspro_server_conn;
-
 /* representing a client-side connection to a RSPRO server */
 struct rspro_server_conn {
 	/* state */
-	struct ipa_client_conn *conn;
+	struct osmo_stream_cli *conn;
 	struct osmo_fsm_inst *fi;
-	struct osmo_fsm_inst *keepalive_fi;
+	struct osmo_ipa_ka_fsm_inst *ka_fi;
 	int (*handle_rx)(struct rspro_server_conn *conn, const RsproPDU_t *pdu);
+
+	/* index into k_reestablish_delay for this connection */
+	size_t reestablish_delay_idx;
+
+	/* timestamp of last re-establish attempt, in milliseconds */
+	int64_t reestablish_last_ms;
+
 	/* IPA protocol identity */
 	struct ipaccess_unit ipa_dev;

osmo-remsim_1.0.0.tar.gz/src/rspro_util.c -> osmo-remsim_1.1.0.tar.gz/src/rspro_util.c Changed

osmo-remsim_1.0.0.tar.gz/src/server/Makefile.am -> osmo-remsim_1.1.0.tar.gz/src/server/Makefile.am Changed

@@ -1,8 +1,16 @@
 
-AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src \
+AM_CFLAGS = -Wall \
+	    -I$(top_srcdir)/include \
+	    -I$(top_builddir)/include \
+	    -I$(top_srcdir)/src \
 	    -I$(top_srcdir)/include/osmocom/rspro \
-	    $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \
-	    $(ULFIUS_CFLAGS) $(JANSSON_CFLAGS) $(ORCANIA_CFLAGS)
+	    $(OSMONETIF_CFLAGS) \
+	    $(OSMOGSM_CFLAGS) \
+	    $(OSMOCORE_CFLAGS) \
+	    $(ULFIUS_CFLAGS) \
+	    $(JANSSON_CFLAGS) \
+	    $(ORCANIA_CFLAGS) \
+	    $(NULL)
 
 noinst_HEADERS = rspro_server.h rest_api.h
 
@@ -10,9 +18,14 @@
 
 osmo_remsim_server_SOURCES = remsim_server.c rspro_server.c rest_api.c \
 			     ../rspro_util.c ../slotmap.c ../debug.c
-osmo_remsim_server_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
-			   $(ULFIUS_LIBS) $(JANSSON_LIBS) $(ORCANIA_LIBS) \
-			   $(top_builddir)/src/libosmo-rspro.la
+osmo_remsim_server_LDADD = $(top_builddir)/src/libosmo-rspro.la \
+			   $(OSMONETIF_LIBS) \
+			   $(OSMOGSM_LIBS) \
+			   $(OSMOCORE_LIBS) \
+			   $(ULFIUS_LIBS) \
+			   $(JANSSON_LIBS) \
+			   $(ORCANIA_LIBS) \
+			   $(NULL)
 
 # as suggested in http://lists.gnu.org/archive/html/automake/2009-03/msg00011.html
 FORCE:

osmo-remsim_1.0.0.tar.gz/src/server/remsim_server.c -> osmo-remsim_1.1.0.tar.gz/src/server/remsim_server.c Changed

@@ -33,9 +33,10 @@
 static void print_help()
 {
 	printf( "  Some useful help...\n"
-		"  -h --help			This text\n"
-		"  -V --version			Print version of the program\n"
-		"  -d --debug option		Enable debug logging (e.g. DMAIN:DST2)\n"
+		"  -h --help                This text\n"
+		"  -V --version             Print version of the program\n"
+		"  -d --debug option        Enable debug logging (e.g. DMAIN:DST2)\n"
+		"  -L --disable-color       Disable colors for logging to stderr\n"
 		);
 }
 
@@ -47,10 +48,11 @@
 			{ "help", 0, 0, 'h' },
 			{ "version", 0, 0, 'V' },
 			{ "debug", 1, 0, 'd' },
-			{0, 0, 0, 0}
+			{ "disable-color", 0, 0, 'L' },
+			{ 0, 0, 0, 0 }
 		};
 
-		c = getopt_long(argc, argv, "hVd:", long_options, &option_index);
+		c = getopt_long(argc, argv, "hVd:L", long_options, &option_index);
 		if (c == -1)
 			break;
 
@@ -66,6 +68,9 @@
 			printf("osmo-resmim-server version %s\n", VERSION);
 			exit(0);
 			break;
+		case 'L':
+			log_set_use_color(osmo_stderr_target, 0);
+			break;
 		default:
 			/* ignore */
 			break;
@@ -80,9 +85,13 @@
 
 int main(int argc, char **argv)
 {
+	char hostname256;
 	void *talloc_rest_ctx;
 	int rc;
 
+	if (gethostname(hostname, sizeof(hostname)) < 0)
+		OSMO_STRLCPY_ARRAY(hostname, "unknown");
+
 	g_tall_ctx = talloc_named_const(NULL, 0, "global");
 	talloc_asn1_ctx = talloc_named_const(g_tall_ctx, 0, "asn1");
 	talloc_rest_ctx = talloc_named_const(g_tall_ctx, 0, "rest");
@@ -106,7 +115,7 @@
 		goto out_rspro;
 
 	g_rps->comp_id.type = ComponentType_remsimServer;
-	OSMO_STRLCPY_ARRAY(g_rps->comp_id.name, "fixme-name");
+	OSMO_STRLCPY_ARRAY(g_rps->comp_id.name, hostname);
 	OSMO_STRLCPY_ARRAY(g_rps->comp_id.software, "remsim-server");
 	OSMO_STRLCPY_ARRAY(g_rps->comp_id.sw_version, PACKAGE_VERSION);
 	/* FIXME: other members of app_comp_id */
@@ -115,13 +124,15 @@
 	if (rc < 0)
 		goto out_rps;
 	osmo_fd_setup(&g_event_ofd, rc, OSMO_FD_READ, event_fd_cb, g_rps, 0);
-	osmo_fd_register(&g_event_ofd);
+	rc = osmo_fd_register(&g_event_ofd);
+	if (rc < 0)
+		goto out_eventfd;
 
 	signal(SIGUSR1, handle_sig_usr1);
 
 	rc = rest_api_init(talloc_rest_ctx, 9997);
 	if (rc < 0)
-		goto out_eventfd;
+		goto out_unregister;
 
 	while (1) {
 		osmo_select_main(0);
@@ -131,11 +142,12 @@
 
 	exit(0);
 
+out_unregister:
+	osmo_fd_unregister(&g_event_ofd);
 out_eventfd:
 	close(g_event_ofd.fd);
 out_rps:
 	talloc_free(g_rps->slotmaps);
-	talloc_free(g_rps);
 out_rspro:
 	rspro_server_destroy(g_rps);

osmo-remsim_1.0.0.tar.gz/src/server/rest_api.c -> osmo-remsim_1.1.0.tar.gz/src/server/rest_api.c Changed

osmo-remsim_1.0.0.tar.gz/src/server/rspro_server.c -> osmo-remsim_1.1.0.tar.gz/src/server/rspro_server.c Changed

@@ -2,6 +2,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <pthread.h>
+#include <errno.h>
 
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/select.h>
@@ -9,7 +10,7 @@
 #include <osmocom/core/logging.h>
 #include <osmocom/core/socket.h>
 #include <osmocom/gsm/protocol/ipaccess.h>
-#include <osmocom/abis/ipa.h>
+#include <osmocom/netif/ipa.h>
 
 #include <osmocom/rspro/RsproPDU.h>
 
@@ -49,7 +50,7 @@
 		osmo_log_backtrace(DMAIN, LOGL_ERROR);
 		return;
 	}
-	LOGPFSM(conn->fi, "Tx RSPRO %s\n", rspro_msgt_name(pdu));
+	LOGPFSML(conn->fi, LOGL_DEBUG, "Tx RSPRO %s\n", rspro_msgt_name(pdu));
 
 	struct msgb *msg_tx = rspro_enc_msg(pdu);
 	if (!msg_tx) {
@@ -59,8 +60,8 @@
 		return;
 	}
 	ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO);
-	ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO);
-	ipa_server_conn_send(conn->peer, msg_tx);
+	ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO);
+	osmo_stream_srv_send(conn->peer, msg_tx);
 }
 
 
@@ -76,6 +77,7 @@
 	CLNTC_ST_WAIT_CONF_RES,		/* waiting for ConfigClientRes */
 	CLNTC_ST_CONNECTED_BANKD,
 	CLNTC_ST_CONNECTED_CLIENT,
+	CLNTC_ST_REJECTED,
 };
 
 enum remsim_server_client_event {
@@ -119,10 +121,18 @@
 static void clnt_st_established(struct osmo_fsm_inst *fi, uint32_t event, void *data)
 {
 	struct rspro_client_conn *conn = fi->priv;
+	struct rspro_client_conn *previous_conn;
 	const RsproPDU_t *pdu = data;
 	const ConnectClientReq_t *cclreq = NULL;
 	const ConnectBankReq_t *cbreq = NULL;
 	RsproPDU_t *resp = NULL;
+	char ip_strINET6_ADDRSTRLEN;
+	char port_str6;
+	int fd = osmo_stream_srv_get_fd(conn->peer);
+
+	/* remote IP and port */
+	osmo_sock_get_ip_and_port(fd, ip_str, sizeof(ip_str),
+				  port_str, sizeof(port_str), false);
 
 	switch (event) {
 	case CLNTC_E_CLIENT_CONN:
@@ -130,15 +140,11 @@
 		/* save the remote component identity in 'conn' */
 		rspro_comp_id_retrieve(&conn->comp_id, &cclreq->identity);
 		if (conn->comp_id.type != ComponentType_remsimClient) {
-			LOGPFSM(fi, "ConnectClientReq from identity != Client ?!?\n");
+			LOGPFSML(fi, LOGL_ERROR, "ConnectClientReq from identity != Client ?!?\n");
 			osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL);
+			return;
 		}
 
-		/* reparent us from srv->connections to srv->clients */
-		pthread_rwlock_wrlock(&conn->srv->rwlock);
-		llist_del(&conn->list);
-		llist_add_tail(&conn->list, &conn->srv->clients);
-		pthread_rwlock_unlock(&conn->srv->rwlock);
 
 		if (!cclreq->clientSlot) {
 #if 0
@@ -150,17 +156,44 @@
 			/* FIXME: the original plan was to dynamically assign a ClientID
 			 * from server to client here. Send ConfigReq and transition to
 			 * CLNTC_ST_WAIT_CONF_RES */
-			LOGPFSM(fi, "ConnectClientReq without ClientId not supported yet!\n");
+			LOGPFSML(fi, LOGL_ERROR, "ConnectClientReq without ClientId not supported yet!\n");
 			osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL);
 #endif
 		} else {
-			/* FIXME: check for unique-ness */
 			rspro2client_slot(&conn->client.slot, cclreq->clientSlot);
 			osmo_fsm_inst_update_id_f(fi, "C%u:%u", conn->client.slot.client_id,
 						  conn->client.slot.slot_nr);
-			osmo_fsm_inst_update_id_f(conn->keepalive_fi, "C%u:%u",
-						  conn->client.slot.client_id,
-						  conn->client.slot.slot_nr);
+			osmo_ipa_ka_fsm_set_id(conn->ka_fi, fi->id);
+			LOGPFSML(fi, LOGL_INFO, "Client connected from %s:%s\n", ip_str, port_str);
+
+			/* check for unique-ness */
+			previous_conn = client_conn_by_slot(conn->srv, &conn->client.slot);
+			if (previous_conn && previous_conn != conn) {
+				/* we're dropping the current (new) connection as we don't really know which
+				 * is the "right" one. Dropping the new gives the old connection time to
+				 * timeout, or to continue to operate.  If we were to drop the old
+				 * connection, this could interrupt a perfectly working connection and opens
+				 * some kind of DoS. */
+				char prev_ip_strINET6_ADDRSTRLEN;
+				char prev_port_str6;
+				int prev_fd = osmo_stream_srv_get_fd(previous_conn->peer);
+				osmo_sock_get_ip_and_port(prev_fd, prev_ip_str, sizeof(prev_ip_str),
+							  prev_port_str, sizeof(prev_port_str), false);
+				LOGPFSML(fi, LOGL_ERROR, "New client connection from %s:%s, but we already "
+					 "have a connection from %s:%s. Dropping new connection.\n",
+					 ip_str, port_str, prev_ip_str, prev_port_str);
+				resp = rspro_gen_ConnectClientRes(&conn->srv->comp_id, ResultCode_identityInUse);
+				client_conn_send(conn, resp);
+				osmo_fsm_inst_state_chg(fi, CLNTC_ST_REJECTED, 1, 2);
+				return;
+			}
+
+			/* reparent us from srv->connections to srv->clients */
+			pthread_rwlock_wrlock(&conn->srv->rwlock);
+			llist_del(&conn->list);
+			llist_add_tail(&conn->list, &conn->srv->clients);
+			pthread_rwlock_unlock(&conn->srv->rwlock);
+
 			resp = rspro_gen_ConnectClientRes(&conn->srv->comp_id, ResultCode_ok);
 			client_conn_send(conn, resp);
 			osmo_fsm_inst_state_chg(fi, CLNTC_ST_CONNECTED_CLIENT, 0, 0);
@@ -171,14 +204,43 @@
 		/* save the remote component identity in 'conn' */
 		rspro_comp_id_retrieve(&conn->comp_id, &cbreq->identity);
 		if (conn->comp_id.type != ComponentType_remsimBankd) {
-			LOGPFSM(fi, "ConnectBankReq from identity != Bank ?!?\n");
+			LOGPFSML(fi, LOGL_ERROR, "ConnectBankReq from identity != Bank ?!?\n");
 			osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL);
+			return;
 		}
-		/* FIXME: check for unique-ness */
 		conn->bank.bank_id = cbreq->bankId;
 		conn->bank.num_slots = cbreq->numberOfSlots;
 		osmo_fsm_inst_update_id_f(fi, "B%u", conn->bank.bank_id);
-		osmo_fsm_inst_update_id_f(conn->keepalive_fi, "B%u", conn->bank.bank_id);
+		osmo_ipa_ka_fsm_set_id(conn->ka_fi, fi->id);
+
+		LOGPFSML(fi, LOGL_INFO, "Bankd connected from %s:%s\n", ip_str, port_str);
+		if (!strncmp(ip_str, "127.", 4)) {
+			LOGPFSML(fi, LOGL_NOTICE, "Bankd connected from %s (localhost). "
+				"This only works if your clients also all are on localhost, "
+				"as they must be able to reach the bankd!\n", ip_str);
+		}
+
+		/* check for unique-ness */
+		previous_conn = bankd_conn_by_id(conn->srv, conn->bank.bank_id);
+		if (previous_conn && previous_conn != conn) {
+			char prev_ip_strINET6_ADDRSTRLEN;
+			char prev_port_str6;
+			int prev_fd = osmo_stream_srv_get_fd(previous_conn->peer);
+			osmo_sock_get_ip_and_port(prev_fd, prev_ip_str, sizeof(prev_ip_str),
+							prev_port_str, sizeof(prev_port_str), false);
+			/* we're dropping the current (new) connection as we don't really know which
+			 * is the "right" one. Dropping the new gives the old connection time to
+			 * timeout, or to continue to operate.  If we were to drop the old
+			 * connection, this could interrupt a perfectly working connection and opens
+			 * some kind of DoS. */
+			LOGPFSML(fi, LOGL_ERROR, "New bankd connection from %s:%s, but we already "
+				 "have a connection from %s:%s. Dropping new connection.\n",
+				 ip_str, port_str, prev_ip_str, prev_port_str);
+			resp = rspro_gen_ConnectBankRes(&conn->srv->comp_id, ResultCode_identityInUse);
+			client_conn_send(conn, resp);
+			osmo_fsm_inst_state_chg(fi, CLNTC_ST_REJECTED, 1, 2);
+			return;
+		}
 
 		/* reparent us from srv->connections to srv->banks */
 		pthread_rwlock_wrlock(&conn->srv->rwlock);
@@ -234,13 +296,13 @@
 	if (!conn)
 		LOGP(DMAIN, LOGL_DEBUG, "%s\n", __func__);
 	else
-		LOGPFSM(conn->fi, "%s\n", __func__);
+		LOGPFSML(conn->fi, LOGL_DEBUG, "%s\n", __func__);
 
 	if (!conn)
 		return;
 
 	if (!bank_slot_equals(&conn->client.bankd.slot, &map->bank)) {
-		LOGPFSM(conn->fi, "BankSlot has changed B%u:%u -> B%u:%u\n",
+		LOGPFSML(conn->fi, LOGL_NOTICE, "BankSlot has changed B%u:%u -> B%u:%u\n",
 			conn->client.bankd.slot.bank_id, conn->client.bankd.slot.slot_nr,
 			map->bank.bank_id, map->bank.slot_nr);
 		conn->client.bankd.slot = map->bank;
@@ -255,10 +317,11 @@
 		bankd_port = 0;
 	} else {
 		/* obtain IP and port of bankd */
-		rc = osmo_sock_get_ip_and_port(bankd_conn->peer->ofd.fd, ip_str, sizeof(ip_str),

osmo-remsim_1.0.0.tar.gz/src/server/rspro_server.h -> osmo-remsim_1.1.0.tar.gz/src/server/rspro_server.h Changed

osmo-remsim_1.0.0.tar.gz/src/slotmap.c -> osmo-remsim_1.1.0.tar.gz/src/slotmap.c Changed

Changes of Revision 3