[M] Change in osmo-remsim[master]: Introduce osmo-remsim-client-socket
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/43742?usp=email ) Change subject: Introduce osmo-remsim-client-socket ...................................................................... Introduce osmo-remsim-client-socket Add new remsim client with socket interface. It is similar to the osmo-remsim-client-shell, but it uses a unix socket instead of stdin and stdout to exchange APDUs. The coding is binary instead of hex string. Related: SYS#8159 Change-Id: I9eddb60e4e7c3191ca2b340690416b53005f714f --- M .gitignore M configure.ac M debian/control A debian/osmo-remsim-client-socket.install M src/client/Makefile.am M src/client/client.h M src/client/remsim_client_main.c A src/client/user_socket.c 8 files changed, 216 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 5a5118b..758ae30 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ src/client/osmo-remsim-client-reader_conf src/client/osmo-remsim-client-shell +src/client/osmo-remsim-client-socket src/client/osmo-remsim-client-st2 src/bankd/pcsc_test src/bankd/osmo-remsim-bankd @@ -42,7 +43,6 @@ deps debian/tmp -debian/osmo-remsim-* debian/libosmo-rspro0 debian/libosmo-rspro-dev debian/*.substvars diff --git a/configure.ac b/configure.ac index a49c79b..04040b2 100644 --- a/configure.ac +++ b/configure.ac @@ -91,6 +91,15 @@ AM_CONDITIONAL(BUILD_CLIENT_IFDHANDLER, test "x$osmo_ac_build_client_ifdhandler" = "xyes") AC_SUBST(BUILD_CLIENT_IFDHANDLER) +AC_ARG_ENABLE([remsim-client-socket], [AS_HELP_STRING([--disable-remsim-client-socket], + [Build osmo-remsim-client-socket])], + [osmo_ac_build_client_socket="$enableval"],[osmo_ac_build_client_socket="yes"]) +if test "$osmo_ac_build_client_socket" = "yes"; then + AC_DEFINE(BUILD_CLIENT_SOCKET, 1, [Define if we want to build osmo-remsim-client-socket]) +fi +AM_CONDITIONAL(BUILD_CLIENT_SOCKET, test "x$osmo_ac_build_client_socket" = "xyes") +AC_SUBST(BUILD_CLIENT_SOCKET) + AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/control b/debian/control index 9351cc5..1110f6b 100644 --- a/debian/control +++ b/debian/control @@ -89,6 +89,14 @@ 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: osmo-remsim-client-socket +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmocom Remote SIM - Socket Client + The remsim-client-socket is similar to remsim-client-shell, but uses a + unix socket instead of stdin and stdout to exchange APDUs. + Package: libifd-osmo-remsim-client0 Architecture: any Multi-Arch: same diff --git a/debian/osmo-remsim-client-socket.install b/debian/osmo-remsim-client-socket.install new file mode 100644 index 0000000..195a7c5 --- /dev/null +++ b/debian/osmo-remsim-client-socket.install @@ -0,0 +1 @@ +usr/bin/osmo-remsim-client-socket diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 5ddd58f..844ad79 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -65,4 +65,18 @@ $(NULL) endif +if BUILD_CLIENT_SOCKET +bin_PROGRAMS += osmo-remsim-client-socket + +osmo_remsim_client_socket_SOURCES = user_socket.c remsim_client_main.c +osmo_remsim_client_socket_CPPFLAGS = -DSOCKET_SUPPORT +osmo_remsim_client_socket_CFLAGS = $(AM_CFLAGS) +osmo_remsim_client_socket_LDADD = $(builddir)/libremsim_client_common.la \ + $(top_builddir)/src/libosmo-rspro.la \ + $(OSMONETIF_LIBS) \ + $(OSMOGSM_LIBS) \ + $(OSMOCORE_LIBS) \ + $(NULL) +endif + noinst_HEADERS = client.h diff --git a/src/client/client.h b/src/client/client.h index 6ec94b7..9ab0b03 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -92,6 +92,13 @@ bool presence_valid; bool presence_pol; } simtrace; + +#ifdef SOCKET_SUPPORT + /* only valid for socket client */ + struct { + char *name; + } socket; +#endif }; struct bankd_client { diff --git a/src/client/remsim_client_main.c b/src/client/remsim_client_main.c index c3f36d6..935e25e 100644 --- a/src/client/remsim_client_main.c +++ b/src/client/remsim_client_main.c @@ -39,6 +39,9 @@ #ifdef SIMTRACE_SUPPORT " -Z --set-sim-presence <0-1> Define the presence pin behaviour (only supported on some boards)\n" #endif +#ifdef SOCKET_SUPPORT + " -S --socket-name PATH Unix socket name\n" +#endif #ifdef USB_SUPPORT " -V --usb-vendor VENDOR_ID\n" " -P --usb-product PRODUCT_ID\n" @@ -69,6 +72,9 @@ { "atr-ignore-rspro", 0, 0, 'r' }, { "event-script", 1, 0, 'e' }, {" disable-color", 0, 0, 'L' }, +#ifdef SOCKET_SUPPORT + { "socket-name", 1, 0, 'S' }, +#endif #ifdef USB_SUPPORT { "usb-vendor", 1, 0, 'V' }, { "usb-product", 1, 0, 'P' }, @@ -85,6 +91,9 @@ #ifdef SIMTRACE_SUPPORT "Z:" #endif +#ifdef SOCKET_SUPPORT + "S:" +#endif #ifdef USB_SUPPORT "V:P:C:I:S:A:H:" #endif @@ -140,6 +149,11 @@ cfg->simtrace.presence_pol = atoi(optarg); break; #endif +#ifdef SOCKET_SUPPORT + case 'S': + osmo_talloc_replace_string(cfg, &cfg->socket.name, optarg); + break; +#endif #ifdef USB_SUPPORT case 'V': cfg->usb.vendor_id = strtol(optarg, NULL, 16); diff --git a/src/client/user_socket.c b/src/client/user_socket.c new file mode 100644 index 0000000..483d4c4 --- /dev/null +++ b/src/client/user_socket.c @@ -0,0 +1,162 @@ +#include <errno.h> +#include <unistd.h> +#include <sys/socket.h> +#include <sys/un.h> +#include <osmocom/core/select.h> +#include <osmocom/core/socket.h> + +#include "client.h" + +/* This is a remsim-client with a unix socket to exchange APDUs. */ + +struct socket_state { + struct osmo_fd ofd; + struct sockaddr_un addr; + socklen_t addr_len; + struct bankd_client *bc; +}; + +/*********************************************************************** + * stdin frontend code to remsim-client + ***********************************************************************/ + +int frontend_request_card_insert(struct bankd_client *bc) +{ + LOGP(DMAIN, LOGL_INFO, "SIM inserted\n"); + return 0; +} + +int frontend_request_card_remove(struct bankd_client *bc) +{ + LOGP(DMAIN, LOGL_INFO, "SIM removed\n"); + return 0; +} + +int frontend_request_sim_remote(struct bankd_client *bc) +{ + return 0; +} + +int frontend_request_sim_local(struct bankd_client *bc) +{ + return 0; +} + +int frontend_request_modem_reset(struct bankd_client *bc) +{ + return 0; +} + +int frontend_handle_card2modem(struct bankd_client *bc, const uint8_t *data, size_t len) +{ + struct socket_state *ss = bc->data; + int rc; + + OSMO_ASSERT(data); + + LOGP(DMAIN, LOGL_DEBUG, "APDU response %s\n", osmo_hexdump(data, len)); + + rc = sendto(ss->ofd.fd, data, len, 0, (struct sockaddr *)&ss->addr, ss->addr_len); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Failed to write to socket (errno = %d).\n", errno); + return rc; + } + + return 0; +} + +int frontend_handle_set_atr(struct bankd_client *bc, const uint8_t *data, size_t len) +{ + struct socket_state *ss = bc->data; + int rc; + + OSMO_ASSERT(data); + + /* Ignore the locally generated ATR. */ + if (len <= 2) + return 0; + + LOGP(DMAIN, LOGL_DEBUG, "SET_ATR %s\n", osmo_hexdump(data, len)); + + rc = sendto(ss->ofd.fd, data, len, 0, (struct sockaddr *)&ss->addr, ss->addr_len); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Failed to write to socket (errno = %d).\n", errno); + return rc; + } + return 0; +} + +int frontend_handle_slot_status(struct bankd_client *bc, const SlotPhysStatus_t *sts) +{ + return 0; +} + +int frontend_append_script_env(struct bankd_client *bc, char **env, int idx, size_t max_env) +{ + return idx; +} + + +/*********************************************************************** + * Incoming command from the user application (stdin shell in our case) + ***********************************************************************/ + +/* call-back function for socket read. */ +static int socket_fd_cb(struct osmo_fd *ofd, unsigned int what) +{ + struct socket_state *ss = ofd->data; + struct frontend_tpdu ftpdu; + uint8_t buf[1024]; + int rc; + + OSMO_ASSERT(what & OSMO_FD_READ); + + ss->addr_len = sizeof(ss->addr); + rc = recvfrom(ss->ofd.fd, buf, sizeof(buf), 0, (struct sockaddr *)&ss->addr, &ss->addr_len); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Failed to read from socket (errno = %d).\n", errno); + return rc; + } + if (rc == 0) { + /* Ignore empty frame. */ + return 0; + } + + LOGP(DMAIN, LOGL_DEBUG, "APDU request %s\n", osmo_hexdump(buf, rc)); + ftpdu.buf = buf; + ftpdu.len = rc; + osmo_fsm_inst_dispatch(ss->bc->main_fi, MF_E_MDM_TPDU, &ftpdu); + + return 0; +} + +/* main function */ +int client_user_main(struct bankd_client *bc) +{ + struct client_config *cfg = bc->cfg; + struct socket_state ss; + int rc; + + memset(&ss, 0, sizeof(ss)); + ss.bc = bc; + bc->data = &ss; + + if (!cfg->socket.name) { + LOGP(DMAIN, LOGL_ERROR, "No socket name specified.\n"); + return -1; + } + rc = osmo_sock_unix_init(SOCK_DGRAM, 0, cfg->socket.name, OSMO_SOCK_F_BIND); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Failed to create socket with name '%s' (errno = %d).\n", + cfg->socket.name, errno); + return -1; + } + osmo_fd_setup(&ss.ofd, rc, OSMO_FD_READ, &socket_fd_cb, &ss, 0); + + rc = osmo_fd_register(&ss.ofd); + if (rc < 0) + return rc; + + while (1) + osmo_select_main(0); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/43742?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I9eddb60e4e7c3191ca2b340690416b53005f714f Gerrit-Change-Number: 43742 Gerrit-PatchSet: 8 Gerrit-Owner: jolly <andreas@eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: lynxis <lynxis@fe80.eu> Gerrit-Reviewer: pespin <pespin@sysmocom.de>
participants (1)
-
laforge