November 2024 - gerrit-log - lists.osmocom.org

[L] Change in libosmo-abis[master]: libosmo-abis depends on libosmo-netif

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38842?usp=email ) Change subject: libosmo-abis depends on libosmo-netif ...................................................................... libosmo-abis depends on libosmo-netif Move the lapd-over-datagram-*.c examples from libosmo-netif to libosmo-abis, since those examples requrie code provided by libosmo-abis. libosmo-abis will be soon making use of libosmo-netif APIs such as those available in stream.h Depends: libosmo-netif.git Change-Id I13d6e88158f6d9ce017986283183ee9c2cc68cae Change-Id: I079dc3999de508301dd37ed03e399356a58d3cab --- M Makefile.am M TODO-RELEASE M configure.ac M contrib/jenkins.sh A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/lapd-over-datagram/lapd-over-datagram-network.c A doc/examples/lapd-over-datagram/lapd-over-datagram-user.c 8 files changed, 456 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/42/38842/1 diff --git a/Makefile.am b/Makefile.am index 5cab5d5..790d055 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,12 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src tests +SUBDIRS = \ + include \ + src \ + tests \ + doc \ + $(NULL) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmoabis.pc libosmotrau.pc diff --git a/TODO-RELEASE b/TODO-RELEASE index 6160b28..06f605a 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmotrau struct osmo_trau2rtp_state extended (ABI break) +libosmo-netif >1.5.0 New dependency diff --git a/configure.ac b/configure.ac index d6b5e63..ae570f2 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,8 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0) PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.5.0) + AC_ARG_ENABLE([ortp], [AS_HELP_STRING([--disable-ortp], [Build without ortp support])], [ ENABLE_ORTP=$enableval @@ -198,6 +200,8 @@ AC_OUTPUT( libosmoabis.pc libosmotrau.pc + doc/Makefile + doc/examples/Makefile include/Makefile src/Makefile tests/Makefile diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b902cc6..91f0c5f 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -20,6 +20,7 @@ verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") osmo-build-dep.sh libosmocore "" --disable-doxygen +osmo-build-dep.sh libosmo-netif "" --disable-doxygen export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..f36084c --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = \ + examples \ + $(NULL) + diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..b1296fa --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,24 @@ +AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CFLAGS=-Wall -g $(LIBOSMONETIF_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +noinst_PROGRAMS = \ + lapd-over-datagram-user \ + lapd-over-datagram-network \ + $(NULL) + +lapd_over_datagram_user_SOURCES = lapd-over-datagram/lapd-over-datagram-user.c +lapd_over_datagram_user_LDADD = \ + $(top_builddir)/src/libosmoabis.la \ + $(LIBOSMONETIF_LIBS) \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + +lapd_over_datagram_network_SOURCES = lapd-over-datagram/lapd-over-datagram-network.c +lapd_over_datagram_network_LDADD = \ + $(top_builddir)/src/libosmoabis.la \ + $(LIBOSMONETIF_LIBS) \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) \ No newline at end of file diff --git a/doc/examples/lapd-over-datagram/lapd-over-datagram-network.c b/doc/examples/lapd-over-datagram/lapd-over-datagram-network.c new file mode 100644 index 0000000..8915e81 --- /dev/null +++ b/doc/examples/lapd-over-datagram/lapd-over-datagram-network.c @@ -0,0 +1,176 @@ +/* LAPD over datagram network-mode example. */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <osmocom/core/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/application.h> +#include <osmocom/core/select.h> + +#include <osmocom/abis/lapd.h> + +#include <osmocom/netif/datagram.h> + +static void *tall_test; + +#define DLAPDTEST 0 + +struct log_info_cat lapd_test_cat[] = { + [DLAPDTEST] = { + .name = "DLAPDTEST", + .description = "LAPD-mode test", + .color = "\033[1;35m", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, +}; + +const struct log_info lapd_test_log_info = { + .filter_fn = NULL, + .cat = lapd_test_cat, + .num_cat = ARRAY_SIZE(lapd_test_cat), +}; + +static struct osmo_dgram *conn; +static struct lapd_instance *lapd; +static int tei = 0; + +void sighandler(int foo) +{ + lapd_instance_free(lapd); + LOGP(DLAPDTEST, LOGL_NOTICE, "closing LAPD.\n"); + exit(EXIT_SUCCESS); +} + +int read_cb(struct osmo_dgram *conn) +{ + int error; + struct msgb *msg; + + LOGP(DLAPDTEST, LOGL_DEBUG, "received message from datagram\n"); + + msg = msgb_alloc(1200, "LAPD/test"); + if (msg == NULL) { + LOGP(DLAPDTEST, LOGL_ERROR, "cannot allocate message\n"); + return -1; + } + if (osmo_dgram_recv(conn, msg) < 0) { + LOGP(DLAPDTEST, LOGL_ERROR, "cannot receive message\n"); + return -1; + } + if (lapd_receive(lapd, msg, &error) < 0) { + LOGP(DLAPDTEST, LOGL_ERROR, "lapd_receive returned error!\n"); + return -1; + } + + return 0; +} + +void lapd_tx_cb(struct msgb *msg, void *cbdata) +{ + struct osmo_dgram *conn = cbdata; + + LOGP(DLAPDTEST, LOGL_DEBUG, "sending message over datagram\n"); + osmo_dgram_send(conn, msg); +} + +void lapd_rx_cb(struct osmo_dlsap_prim *dp, uint8_t tei, uint8_t sapi, + void *rx_cbdata) +{ + struct msgb *msg = dp->oph.msg; + + switch (dp->oph.primitive) { + case PRIM_DL_EST: + DEBUGP(DLAPDTEST, "DL_EST: sapi(%d) tei(%d)\n", sapi, tei); + break; + case PRIM_DL_REL: + DEBUGP(DLAPDTEST, "DL_REL: sapi(%d) tei(%d)\n", sapi, tei); + break; + case PRIM_DL_DATA: + case PRIM_DL_UNIT_DATA: + if (dp->oph.operation == PRIM_OP_INDICATION) { + struct msgb *nmsg; + char *ptr; + int x; + + msg->l2h = msg->l3h; + + DEBUGP(DLAPDTEST, "RX: %s sapi=%d tei=%d\n", + osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)), + sapi, tei); + + LOGP(DLAPDTEST, LOGL_DEBUG, "forwarding message\n"); + + nmsg = msgb_alloc(1024, "LAPD/test"); + if (nmsg == NULL) { + LOGP(DLAPDTEST, LOGL_ERROR, "cannot alloc msg\n"); + return; + } + ptr = (char *)msgb_put(nmsg, sizeof(int)); + + x = *((int *)msg->data); + memcpy(ptr, &x, sizeof(int)); + + /* send the message back to client over LAPD */ + lapd_transmit(lapd, tei, sapi, msg); + return; + } + break; + case PRIM_MDL_ERROR: + DEBUGP(DLMI, "MDL_EERROR: cause(%d)\n", dp->u.error_ind.cause); + break; + default: + printf("ERROR: unknown prim\n"); + break; + } +} + +int main(int argc, char *argv[]) +{ + struct lapd_tei *teip; + + tall_test = talloc_named_const(NULL, 1, "lapd_test"); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &lapd_test_log_info); + log_set_log_level(osmo_stderr_target, LOGL_NOTICE); + + /* + * initialize datagram server. + */ + + conn = osmo_dgram_create(tall_test); + if (conn == NULL) { + fprintf(stderr, "cannot create client\n"); + exit(EXIT_FAILURE); + } + osmo_dgram_set_local_addr(conn, "127.0.0.1"); + osmo_dgram_set_local_port(conn, 10001); + osmo_dgram_set_remote_addr(conn, "127.0.0.1"); + osmo_dgram_set_remote_port(conn, 10000); + osmo_dgram_set_read_cb(conn, read_cb); + + lapd = lapd_instance_alloc(1, lapd_tx_cb, conn, lapd_rx_cb, conn, + &lapd_profile_sat); + if (lapd == NULL) { + LOGP(DLAPDTEST, LOGL_ERROR, "cannot allocate instance\n"); + exit(EXIT_FAILURE); + } + + teip = lapd_tei_alloc(lapd, tei); + if (teip == NULL) { + LOGP(DLAPDTEST, LOGL_ERROR, "cannot assign TEI\n"); + exit(EXIT_FAILURE); + } + + if (osmo_dgram_open(conn) < 0) { + fprintf(stderr, "cannot open client\n"); + exit(EXIT_FAILURE); + } + + LOGP(DLAPDTEST, LOGL_NOTICE, "Entering main loop\n"); + + while (1) + osmo_select_main(0); +} diff --git a/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c b/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c new file mode 100644 index 0000000..c988b22 --- /dev/null +++ b/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c @@ -0,0 +1,240 @@ +/* LAPD over datagram user-mode example. */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <signal.h> +#include <unistd.h> +#include <arpa/inet.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/application.h> +#include <osmocom/core/select.h> + +#include <osmocom/abis/lapd.h> + +#include <osmocom/netif/datagram.h> + +static LLIST_HEAD(msg_sent_list); + +struct msg_sent { + struct llist_head head; + struct msgb *msg; + int num; + struct timeval tv; +}; + +#define DLAPDTEST 0 + +struct log_info_cat lapd_test_cat[] = { + [DLAPDTEST] = { + .name = "DLAPDTEST", + .description = "LAPD-mode test", + .color = "\033[1;35m", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, +}; + +const struct log_info lapd_test_log_info = { + .filter_fn = NULL, + .cat = lapd_test_cat, + .num_cat = ARRAY_SIZE(lapd_test_cat), +}; + +static struct osmo_dgram *conn; +static struct lapd_instance *lapd; +static int sapi = 63, tei = 0; + +void sighandler(int foo) +{ + lapd_sap_stop(lapd, tei, sapi); + lapd_instance_free(lapd); + LOGP(DLINP, LOGL_NOTICE, "closing LAPD.\n"); + exit(EXIT_SUCCESS); +} + +static int read_cb(struct osmo_dgram *conn) +{ + int error; + struct msgb *msg; + + msg = msgb_alloc(1200, "LAPD/test"); + if (msg == NULL) { + LOGP(DLAPDTEST, LOGL_ERROR, "cannot allocate message\n"); + return -1; + } + if (osmo_dgram_recv(conn, msg) < 0) { + msgb_free(msg); + LOGP(DLAPDTEST, LOGL_ERROR, "cannot receive message\n"); + return -1; + } + if (lapd_receive(lapd, msg, &error) < 0) { + msgb_free(msg); + LOGP(DLINP, LOGL_ERROR, "lapd_receive returned error!\n"); + return -1; + } + return 0; +} + +static void *tall_test; + +void lapd_tx_cb(struct msgb *msg, void *cbdata) +{ + LOGP(DLINP, LOGL_DEBUG, "sending message over datagram\n"); + osmo_dgram_send(conn, msg); +} + +void lapd_rx_cb(struct osmo_dlsap_prim *dp, uint8_t tei, uint8_t sapi, + void *rx_cbdata) +{ + struct msgb *msg = dp->oph.msg; + int *__msgs = rx_cbdata; + int num_msgs = *__msgs; + + switch (dp->oph.primitive) { + case PRIM_DL_EST: + DEBUGP(DLAPDTEST, "DL_EST: sapi(%d) tei(%d)\n", sapi, tei); + + int i; + for (i = 0; i < num_msgs; i++) { + struct msgb *msg; + struct msg_sent *msg_sent; + char *ptr; + int x; + + msg = msgb_alloc(1024, "LAPD/test"); + if (msg == NULL) { + LOGP(DLINP, LOGL_ERROR, "cannot alloc msg\n"); + return; + } + ptr = (char *)msgb_put(msg, sizeof(int)); + + x = htonl(i); + memcpy(ptr, &x, sizeof(int)); + + msg_sent = talloc_zero(NULL, struct msg_sent); + if (msg_sent == NULL) { + LOGP(DLINP, LOGL_ERROR, "can't alloc struct\n"); + return; + } + msg_sent->msg = msg; + gettimeofday(&msg_sent->tv, NULL); + msg_sent->num = i; + llist_add(&msg_sent->head, &msg_sent_list); + + lapd_transmit(lapd, tei, sapi, msg); + + LOGP(DLAPDTEST, LOGL_DEBUG, "enqueueing msg %d of " + "%d bytes to be sent over LAPD\n", i, msg->len); + } + break; + case PRIM_DL_REL: + DEBUGP(DLAPDTEST, "DL_REL: sapi(%d) tei(%d)\n", sapi, tei); + break; + case PRIM_DL_DATA: + case PRIM_DL_UNIT_DATA: + if (dp->oph.operation == PRIM_OP_INDICATION) { + msg->l2h = msg->l3h; + DEBUGP(DLAPDTEST, "RX: %s sapi=%d tei=%d\n", + osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)), + sapi, tei); + + int num; + struct msg_sent *cur, *tmp, *found = NULL; + + num = ntohl(*((int *)msg->data)); + LOGP(DLINP, LOGL_DEBUG, + "received msg number %d\n", num); + + llist_for_each_entry_safe(cur, tmp, + &msg_sent_list, head) { + if (cur->num == num) { + llist_del(&cur->head); + found = cur; + break; + } + } + if (found) { + struct timeval tv, diff; + + gettimeofday(&tv, NULL); + timersub(&tv, &found->tv, &diff); + + LOGP(DLINP, LOGL_NOTICE, "message %d replied " + "in %lu.%.6lu\n", + num, diff.tv_sec, diff.tv_usec); + talloc_free(found); + } else { + LOGP(DLINP, LOGL_ERROR, + "message %d not found!\n", num); + } + } + break; + case PRIM_MDL_ERROR: + DEBUGP(DLMI, "MDL_EERROR: cause(%d)\n", dp->u.error_ind.cause); + break; + default: + printf("ERROR: unknown prim\n"); + break; + } +} + +int main(int argc, char *argv[]) +{ + int num_msgs; + + signal(SIGINT, sighandler); + + if (argc != 2) { + printf("Usage: %s [num_msgs]\n", argv[0]); + exit(EXIT_FAILURE); + } + num_msgs = atoi(argv[1]); + + tall_test = talloc_named_const(NULL, 1, "lapd_test"); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &lapd_test_log_info); + log_set_log_level(osmo_stderr_target, LOGL_NOTICE); + /* + * initialize LAPD stuff. + */ + + lapd = lapd_instance_alloc(0, lapd_tx_cb, NULL, lapd_rx_cb, &num_msgs, + &lapd_profile_sat); + if (lapd == NULL) { + LOGP(DLINP, LOGL_ERROR, "cannot allocate instance\n"); + exit(EXIT_FAILURE); + } + + /* + * initialize datagram socket. + */ + + conn = osmo_dgram_create(tall_test); + if (conn == NULL) { + fprintf(stderr, "cannot create client\n"); + exit(EXIT_FAILURE); + } + osmo_dgram_set_local_addr(conn, "127.0.0.1"); + osmo_dgram_set_local_port(conn, 10000); + osmo_dgram_set_remote_addr(conn, "127.0.0.1"); + osmo_dgram_set_remote_port(conn, 10001); + osmo_dgram_set_read_cb(conn, read_cb); + + if (osmo_dgram_open(conn) < 0) { + fprintf(stderr, "cannot open client\n"); + exit(EXIT_FAILURE); + } + + if (lapd_sap_start(lapd, tei, sapi) < 0) { + LOGP(DLINP, LOGL_ERROR, "cannot start user-side LAPD\n"); + exit(EXIT_FAILURE); + } + + LOGP(DLINP, LOGL_NOTICE, "Entering main loop\n"); + + while (1) + osmo_select_main(0); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38842?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I079dc3999de508301dd37ed03e399356a58d3cab Gerrit-Change-Number: 38842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[L] Change in libosmo-netif[master]: Drop libosmo-abis cond dep together with examples/lapd-over-datagram

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38841?usp=email ) Change subject: Drop libosmo-abis cond dep together with examples/lapd-over-datagram ...................................................................... Drop libosmo-abis cond dep together with examples/lapd-over-datagram libosmo-netif should never depend on libosmo-abis, since it provides interfaces way more generic than libosmo-abis. libosmo-abis will in the near future use libosmo-netif's stream APIs, so break the circular dependency here. The lapd-over-datagram-* examples will be moved to libosmo-abis since lapd stuff is defined there. Change-Id: I13d6e88158f6d9ce017986283183ee9c2cc68cae --- M configure.ac M contrib/jenkins.sh M examples/Makefile.am D examples/lapd-over-datagram-network.c D examples/lapd-over-datagram-user.c M src/Makefile.am 6 files changed, 2 insertions(+), 447 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/41/38841/1 diff --git a/configure.ac b/configure.ac index 98755cf..9513270 100644 --- a/configure.ac +++ b/configure.ac @@ -93,19 +93,6 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0) PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.10.0) -AC_ARG_ENABLE([lapd_examples], - [AS_HELP_STRING( - [--enable-lapd-examples], - [Build some lapd examples] - )], - [lapd_examples=$enableval], [lapd_examples="no"]) -AS_IF([test "x$lapd_examples" = "xyes"], [ - PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.5.0) - AC_DEFINE([ENABLE_LAPD], [1], [Enable LAPD examples]) -]) -AM_CONDITIONAL(ENABLE_LAPD, test "x$lapd_examples" = "xyes") -AC_SUBST(ENABLE_LAPD) - AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])], [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) AM_CONDITIONAL(ENABLE_LIBSCTP, test x"$ENABLE_LIBSCTP" = x"yes") diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 543671c..53af2e0 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -24,7 +24,6 @@ export LD_LIBRARY_PATH="$inst/lib" osmo-build-dep.sh libosmocore "" --disable-doxygen -osmo-build-dep.sh libosmo-abis set +x echo diff --git a/examples/Makefile.am b/examples/Makefile.am index 6d74238..6c9cd6a 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) +AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) noinst_PROGRAMS = ipa-stream-client \ @@ -25,19 +25,6 @@ ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -if ENABLE_LAPD -noinst_PROGRAMS += lapd-over-datagram-user lapd-over-datagram-network -lapd_over_datagram_user_SOURCES = lapd-over-datagram-user.c -lapd_over_datagram_user_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOABIS_LIBS) - -lapd_over_datagram_network_SOURCES = lapd-over-datagram-network.c -lapd_over_datagram_network_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOABIS_LIBS) -endif - stream_client_SOURCES = stream-client.c stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) diff --git a/examples/lapd-over-datagram-network.c b/examples/lapd-over-datagram-network.c deleted file mode 100644 index 58ba0ce..0000000 --- a/examples/lapd-over-datagram-network.c +++ /dev/null @@ -1,177 +0,0 @@ -/* LAPD over datagram network-mode example. */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include <osmocom/core/talloc.h> -#include <osmocom/core/msgb.h> -#include <osmocom/core/logging.h> -#include <osmocom/core/application.h> -#include <osmocom/core/select.h> - -#include <osmocom/abis/lapd.h> - -#include <osmocom/netif/datagram.h> - -static void *tall_test; - -#define DLAPDTEST 0 - -struct log_info_cat lapd_test_cat[] = { - [DLAPDTEST] = { - .name = "DLAPDTEST", - .description = "LAPD-mode test", - .color = "\033[1;35m", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, -}; - -const struct log_info lapd_test_log_info = { - .filter_fn = NULL, - .cat = lapd_test_cat, - .num_cat = ARRAY_SIZE(lapd_test_cat), -}; - -static struct osmo_dgram *conn; -static struct lapd_instance *lapd; -static int tei = 0; - -void sighandler(int foo) -{ - lapd_instance_free(lapd); - LOGP(DLAPDTEST, LOGL_NOTICE, "closing LAPD.\n"); - exit(EXIT_SUCCESS); -} - -int read_cb(struct osmo_dgram *conn) -{ - int error; - struct msgb *msg; - - LOGP(DLAPDTEST, LOGL_DEBUG, "received message from datagram\n"); - - msg = msgb_alloc(1200, "LAPD/test"); - if (msg == NULL) { - LOGP(DLAPDTEST, LOGL_ERROR, "cannot allocate message\n"); - return -1; - } - if (osmo_dgram_recv(conn, msg) < 0) { - LOGP(DLAPDTEST, LOGL_ERROR, "cannot receive message\n"); - return -1; - } - if (lapd_receive(lapd, msg, &error) < 0) { - LOGP(DLAPDTEST, LOGL_ERROR, "lapd_receive returned error!\n"); - return -1; - } - - return 0; -} - -void lapd_tx_cb(struct msgb *msg, void *cbdata) -{ - struct osmo_dgram *conn = cbdata; - - LOGP(DLAPDTEST, LOGL_DEBUG, "sending message over datagram\n"); - osmo_dgram_send(conn, msg); -} - -void lapd_rx_cb(struct osmo_dlsap_prim *dp, uint8_t tei, uint8_t sapi, - void *rx_cbdata) -{ - struct msgb *msg = dp->oph.msg; - - switch (dp->oph.primitive) { - case PRIM_DL_EST: - DEBUGP(DLAPDTEST, "DL_EST: sapi(%d) tei(%d)\n", sapi, tei); - break; - case PRIM_DL_REL: - DEBUGP(DLAPDTEST, "DL_REL: sapi(%d) tei(%d)\n", sapi, tei); - break; - case PRIM_DL_DATA: - case PRIM_DL_UNIT_DATA: - if (dp->oph.operation == PRIM_OP_INDICATION) { - struct msgb *nmsg; - char *ptr; - int x; - - msg->l2h = msg->l3h; - - DEBUGP(DLAPDTEST, "RX: %s sapi=%d tei=%d\n", - osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)), - sapi, tei); - - LOGP(DLAPDTEST, LOGL_DEBUG, "forwarding message\n"); - - nmsg = msgb_alloc(1024, "LAPD/test"); - if (nmsg == NULL) { - LOGP(DLAPDTEST, LOGL_ERROR, "cannot alloc msg\n"); - return; - } - ptr = (char *)msgb_put(nmsg, sizeof(int)); - - x = *((int *)msg->data); - memcpy(ptr, &x, sizeof(int)); - - /* send the message back to client over LAPD */ - lapd_transmit(lapd, tei, sapi, msg); - return; - } - break; - case PRIM_MDL_ERROR: - DEBUGP(DLMI, "MDL_EERROR: cause(%d)\n", dp->u.error_ind.cause); - break; - default: - printf("ERROR: unknown prim\n"); - break; - } -} - -int main(int argc, char *argv[]) -{ - struct lapd_tei *teip; - - tall_test = talloc_named_const(NULL, 1, "lapd_test"); - msgb_talloc_ctx_init(tall_test, 0); - osmo_init_logging2(tall_test, &lapd_test_log_info); - log_set_log_level(osmo_stderr_target, LOGL_NOTICE); - - /* - * initialize datagram server. - */ - - conn = osmo_dgram_create(tall_test); - if (conn == NULL) { - fprintf(stderr, "cannot create client\n"); - exit(EXIT_FAILURE); - } - osmo_dgram_set_local_addr(conn, "127.0.0.1"); - osmo_dgram_set_local_port(conn, 10001); - osmo_dgram_set_remote_addr(conn, "127.0.0.1"); - osmo_dgram_set_remote_port(conn, 10000); - osmo_dgram_set_read_cb(conn, read_cb); - - lapd = lapd_instance_alloc(1, lapd_tx_cb, conn, lapd_rx_cb, conn, - &lapd_profile_sat); - if (lapd == NULL) { - LOGP(DLAPDTEST, LOGL_ERROR, "cannot allocate instance\n"); - exit(EXIT_FAILURE); - } - - teip = lapd_tei_alloc(lapd, tei); - if (teip == NULL) { - LOGP(DLAPDTEST, LOGL_ERROR, "cannot assign TEI\n"); - exit(EXIT_FAILURE); - } - - if (osmo_dgram_open(conn) < 0) { - fprintf(stderr, "cannot open client\n"); - exit(EXIT_FAILURE); - } - - LOGP(DLAPDTEST, LOGL_NOTICE, "Entering main loop\n"); - - while(1) { - osmo_select_main(0); - } -} diff --git a/examples/lapd-over-datagram-user.c b/examples/lapd-over-datagram-user.c deleted file mode 100644 index f11f49f..0000000 --- a/examples/lapd-over-datagram-user.c +++ /dev/null @@ -1,241 +0,0 @@ -/* LAPD over datagram user-mode example. */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <signal.h> -#include <unistd.h> -#include <arpa/inet.h> - -#include <osmocom/core/linuxlist.h> -#include <osmocom/core/talloc.h> -#include <osmocom/core/msgb.h> -#include <osmocom/core/logging.h> -#include <osmocom/core/application.h> -#include <osmocom/core/select.h> - -#include <osmocom/abis/lapd.h> - -#include <osmocom/netif/datagram.h> - -static LLIST_HEAD(msg_sent_list); - -struct msg_sent { - struct llist_head head; - struct msgb *msg; - int num; - struct timeval tv; -}; - -#define DLAPDTEST 0 - -struct log_info_cat lapd_test_cat[] = { - [DLAPDTEST] = { - .name = "DLAPDTEST", - .description = "LAPD-mode test", - .color = "\033[1;35m", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, -}; - -const struct log_info lapd_test_log_info = { - .filter_fn = NULL, - .cat = lapd_test_cat, - .num_cat = ARRAY_SIZE(lapd_test_cat), -}; - -static struct osmo_dgram *conn; -static struct lapd_instance *lapd; -static int sapi = 63, tei = 0; - -void sighandler(int foo) -{ - lapd_sap_stop(lapd, tei, sapi); - lapd_instance_free(lapd); - LOGP(DLINP, LOGL_NOTICE, "closing LAPD.\n"); - exit(EXIT_SUCCESS); -} - -static int read_cb(struct osmo_dgram *conn) -{ - int error; - struct msgb *msg; - - msg = msgb_alloc(1200, "LAPD/test"); - if (msg == NULL) { - LOGP(DLAPDTEST, LOGL_ERROR, "cannot allocate message\n"); - return -1; - } - if (osmo_dgram_recv(conn, msg) < 0) { - msgb_free(msg); - LOGP(DLAPDTEST, LOGL_ERROR, "cannot receive message\n"); - return -1; - } - if (lapd_receive(lapd, msg, &error) < 0) { - msgb_free(msg); - LOGP(DLINP, LOGL_ERROR, "lapd_receive returned error!\n"); - return -1; - } - return 0; -} - -static void *tall_test; - -void lapd_tx_cb(struct msgb *msg, void *cbdata) -{ - LOGP(DLINP, LOGL_DEBUG, "sending message over datagram\n"); - osmo_dgram_send(conn, msg); -} - -void lapd_rx_cb(struct osmo_dlsap_prim *dp, uint8_t tei, uint8_t sapi, - void *rx_cbdata) -{ - struct msgb *msg = dp->oph.msg; - int *__msgs = rx_cbdata; - int num_msgs = *__msgs; - - switch (dp->oph.primitive) { - case PRIM_DL_EST: - DEBUGP(DLAPDTEST, "DL_EST: sapi(%d) tei(%d)\n", sapi, tei); - - int i; - for (i=0; i<num_msgs; i++) { - struct msgb *msg; - struct msg_sent *msg_sent; - char *ptr; - int x; - - msg = msgb_alloc(1024, "LAPD/test"); - if (msg == NULL) { - LOGP(DLINP, LOGL_ERROR, "cannot alloc msg\n"); - return; - } - ptr = (char *)msgb_put(msg, sizeof(int)); - - x = htonl(i); - memcpy(ptr, &x, sizeof(int)); - - msg_sent = talloc_zero(NULL, struct msg_sent); - if (msg_sent == NULL) { - LOGP(DLINP, LOGL_ERROR, "can't alloc struct\n"); - return; - } - msg_sent->msg = msg; - gettimeofday(&msg_sent->tv, NULL); - msg_sent->num = i; - llist_add(&msg_sent->head, &msg_sent_list); - - lapd_transmit(lapd, tei, sapi, msg); - - LOGP(DLAPDTEST, LOGL_DEBUG, "enqueueing msg %d of " - "%d bytes to be sent over LAPD\n", i, msg->len); - } - break; - case PRIM_DL_REL: - DEBUGP(DLAPDTEST, "DL_REL: sapi(%d) tei(%d)\n", sapi, tei); - break; - case PRIM_DL_DATA: - case PRIM_DL_UNIT_DATA: - if (dp->oph.operation == PRIM_OP_INDICATION) { - msg->l2h = msg->l3h; - DEBUGP(DLAPDTEST, "RX: %s sapi=%d tei=%d\n", - osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)), - sapi, tei); - - int num; - struct msg_sent *cur, *tmp, *found = NULL; - - num = ntohl(*((int *)msg->data)); - LOGP(DLINP, LOGL_DEBUG, - "received msg number %d\n", num); - - llist_for_each_entry_safe(cur, tmp, - &msg_sent_list, head) { - if (cur->num == num) { - llist_del(&cur->head); - found = cur; - break; - } - } - if (found) { - struct timeval tv, diff; - - gettimeofday(&tv, NULL); - timersub(&tv, &found->tv, &diff); - - LOGP(DLINP, LOGL_NOTICE, "message %d replied " - "in %lu.%.6lu\n", - num, diff.tv_sec, diff.tv_usec); - talloc_free(found); - } else { - LOGP(DLINP, LOGL_ERROR, - "message %d not found!\n", num); - } - } - break; - case PRIM_MDL_ERROR: - DEBUGP(DLMI, "MDL_EERROR: cause(%d)\n", dp->u.error_ind.cause); - break; - default: - printf("ERROR: unknown prim\n"); - break; - } -} - -int main(int argc, char *argv[]) -{ - int num_msgs; - - signal(SIGINT, sighandler); - - if (argc != 2) { - printf("Usage: %s [num_msgs]\n", argv[0]); - exit(EXIT_FAILURE); - } - num_msgs = atoi(argv[1]); - - tall_test = talloc_named_const(NULL, 1, "lapd_test"); - msgb_talloc_ctx_init(tall_test, 0); - osmo_init_logging2(tall_test, &lapd_test_log_info); - log_set_log_level(osmo_stderr_target, LOGL_NOTICE); - /* - * initialize LAPD stuff. - */ - - lapd = lapd_instance_alloc(0, lapd_tx_cb, NULL, lapd_rx_cb, &num_msgs, - &lapd_profile_sat); - if (lapd == NULL) { - LOGP(DLINP, LOGL_ERROR, "cannot allocate instance\n"); - exit(EXIT_FAILURE); - } - - /* - * initialize datagram socket. - */ - - conn = osmo_dgram_create(tall_test); - if (conn == NULL) { - fprintf(stderr, "cannot create client\n"); - exit(EXIT_FAILURE); - } - osmo_dgram_set_local_addr(conn, "127.0.0.1"); - osmo_dgram_set_local_port(conn, 10000); - osmo_dgram_set_remote_addr(conn, "127.0.0.1"); - osmo_dgram_set_remote_port(conn, 10001); - osmo_dgram_set_read_cb(conn, read_cb); - - if (osmo_dgram_open(conn) < 0) { - fprintf(stderr, "cannot open client\n"); - exit(EXIT_FAILURE); - } - - if (lapd_sap_start(lapd, tei, sapi) < 0) { - LOGP(DLINP, LOGL_ERROR, "cannot start user-side LAPD\n"); - exit(EXIT_FAILURE); - } - - LOGP(DLINP, LOGL_NOTICE, "Entering main loop\n"); - - while(1) { - osmo_select_main(0); - } -} diff --git a/src/Makefile.am b/src/Makefile.am index 2ceadc0..258d04a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ LIBVERSION=13:1:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) +AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) lib_LTLIBRARIES = libosmonetif.la -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38841?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I13d6e88158f6d9ce017986283183ee9c2cc68cae Gerrit-Change-Number: 38841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: SGSN: BSSGP_ConnHdlr: GMM Service Request: add support to expect auth...

by lynxis lazus

Attention is currently required from: fixeria, laforge. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38396?usp=email ) Change subject: SGSN: BSSGP_ConnHdlr: GMM Service Request: add support to expect authentication ...................................................................... Patch Set 3: (4 comments) Patchset: PS1: > we should test the specific behaviour we expect from our osmo-sgsn implementation. […] I have made the change optional. The default behavior isn't changed. File sgsn/BSSGP_ConnHdlr.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38396/comment/de77ab1f_234b… : PS3, Line 333: > one tab, not two Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38396/comment/f5ab0365_04f0… : PS3, Line 694: setverdict(pass); > so we don't expect service accept, but still we `setverdict(pass)`? Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38396/comment/c21743ca_9335… : PS3, Line 760: GSUP SAI Req > `GMM Auth Req` Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38396?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9ed08160bf5413e3a30d6e90eb947d4d799e1058 Gerrit-Change-Number: 38396 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Nov 2024 16:26:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

7 months, 1 week

1
0
0 0

[XS] Change in osmo-sgsn[master]: gmm: Fix reject small size RAU request

by pespin

Attention is currently required from: daniel, lynxis lazus. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38834?usp=email ) Change subject: gmm: Fix reject small size RAU request ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > 3.2.1 R99 says: Table 9.4.14/TS 24.008: ROUTING AREA UPDATE REQUEST message content: […] @lynxis@fe80.eu feel free to take over and have a look, I only submitted this since I saw it fixed ttcn3 tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38834?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I49210a04b16e6e2fc9d799b99c2fa415f28ddbba Gerrit-Change-Number: 38834 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 20 Nov 2024 16:14:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

7 months, 1 week

1
0
0 0

[XS] Change in osmo-sgsn[master]: gmm: Fix reject small size RAU request

by lynxis lazus

Attention is currently required from: daniel, pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38834?usp=email ) Change subject: gmm: Fix reject small size RAU request ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > This change is fixing TC_attach_rau. Check the RAU req in https://jenkins.osmocom. […] 3.2.1 R99 says: Table 9.4.14/TS 24.008: ROUTING AREA UPDATE REQUEST message content: Sorry, it is 15 not 16. counting is hard. Counting all the mandatory values to be 3 + 6 + 6 => 15. Depending how long the radio access cap is. I guess radio cap with values less than 3 doesn't support GPRS? (14 seems to be fine as long the radio capp length matches). Yes, I'm not sure how correct the radio cap is in ttcn3. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38834?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I49210a04b16e6e2fc9d799b99c2fa415f28ddbba Gerrit-Change-Number: 38834 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Nov 2024 16:11:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

7 months, 1 week

1
0
0 0

[XS] Change in osmo-sgsn[master]: gmm: Fix reject small size RAU request

by lynxis lazus

Attention is currently required from: daniel, pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38834?usp=email ) Change subject: gmm: Fix reject small size RAU request ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: 3.2.1 R99 says: Table 9.4.14/TS 24.008: ROUTING AREA UPDATE REQUEST message content: Counting all the mandatory values to be 3 + 6 + 6 => 15. Depending how long the radio access cap is. I guess radio cap with values less than 3 doesn't support GPRS? (14 seems to be fine as long the radio capp length matches). Yes, I'm not sure how correct the radio cap is in ttcn3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38834?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I49210a04b16e6e2fc9d799b99c2fa415f28ddbba Gerrit-Change-Number: 38834 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Nov 2024 16:11:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 1 week

1
0
0 0

[XS] Change in android-apdu-proxy[master]: MainActivity: use Double:valueOf to convert release version number

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/38840?usp=email ) Change subject: MainActivity: use Double:valueOf to convert release version number ...................................................................... MainActivity: use Double:valueOf to convert release version number Releases are not always integer numbers, they can have decimal places too. Related: OS#6367 Change-Id: I2d0a72269e4056fb6f5ee8587b8d4ba762dd9d6d --- M app/src/main/java/org/osmocom/androidApduProxy/MainActivity.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/app/src/main/java/org/osmocom/androidApduProxy/MainActivity.java b/app/src/main/java/org/osmocom/androidApduProxy/MainActivity.java index fcdebea..e0174e6 100644 --- a/app/src/main/java/org/osmocom/androidApduProxy/MainActivity.java +++ b/app/src/main/java/org/osmocom/androidApduProxy/MainActivity.java @@ -164,7 +164,7 @@ //an error message and continue normally, maybe we are lucky and it works anyway. //(This check only works on Android 11 and higher, //see also https://developer.android.com/develop/connectivity/telecom/dialer-app/telep…) - if (Integer.valueOf(Build.VERSION.RELEASE) >= 11 && + if (Double.valueOf(Build.VERSION.RELEASE) >= 11 && !packageManager.hasSystemFeature(PackageManager.FEATURE_SE_OMAPI_UICC)) { msgBox("Feature FEATURE_SE_OMAPI_UICC is not available on this device, APDU access to UICC/eUICC not possible!", "Error"); -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38840?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: I2d0a72269e4056fb6f5ee8587b8d4ba762dd9d6d Gerrit-Change-Number: 38840 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in android-apdu-proxy[master]: READMe.md: add another OMAPI related URL to documentation

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/38839?usp=email ) Change subject: READMe.md: add another OMAPI related URL to documentation ...................................................................... READMe.md: add another OMAPI related URL to documentation Related: OS#6367 Change-Id: I048e64ae95438b343c7a037c9c7a4da567344449 --- M README.md 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/README.md b/README.md index c5d1ebb..789cdd4 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ Android APDU proxy will return a 6A82 status word. More information about OMAPI can be found under: +* https://source.android.com/docs/security/features/open-mobile-api * https://developer.android.com/reference/android/se/omapi/package-summary * https://globalplatform.org/wp-content/uploads/2018/04/GPD_Open_Mobile_API_S… -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38839?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: I048e64ae95438b343c7a037c9c7a4da567344449 Gerrit-Change-Number: 38839 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in android-apdu-proxy[master]: READMe.md: add another OMAPI related URL to documentation

by dexter

dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/38839?usp=email ) Change subject: READMe.md: add another OMAPI related URL to documentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38839?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: I048e64ae95438b343c7a037c9c7a4da567344449 Gerrit-Change-Number: 38839 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Nov 2024 15:32:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[XS] Change in android-apdu-proxy[master]: MainActivity: use Double:valueOf to convert release version number

by dexter

dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/38840?usp=email ) Change subject: MainActivity: use Double:valueOf to convert release version number ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38840?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: I2d0a72269e4056fb6f5ee8587b8d4ba762dd9d6d Gerrit-Change-Number: 38840 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Nov 2024 15:32:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024