pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39021?usp=email )
Change subject: Remove rspro_client.c which is not used anyway ......................................................................
Remove rspro_client.c which is not used anyway
rspro_client.c was already removed ~6 years ago in 511c51313d4b1994eaa5faebcf01e8e24fb8b5a5, so those APIs where not really implemented and hence used. Remove the header.
Related: OS#5896 Change-Id: I3bacae853101a79804553175ebd4482acb188597 --- M debian/libosmo-rspro-dev.install M include/osmocom/rspro/Makefile.am D include/osmocom/rspro/rspro_client.h 3 files changed, 0 insertions(+), 65 deletions(-)
Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved
diff --git a/debian/libosmo-rspro-dev.install b/debian/libosmo-rspro-dev.install index 5abeb9c..56c5908 100644 --- a/debian/libosmo-rspro-dev.install +++ b/debian/libosmo-rspro-dev.install @@ -1,4 +1,3 @@ -usr/include/osmocom/rspro usr/lib/*/libosmo-rspro*.a usr/lib/*/libosmo-rspro*.so usr/lib/*/libosmo-rspro*.la diff --git a/include/osmocom/rspro/Makefile.am b/include/osmocom/rspro/Makefile.am index 7549ffb..1943af1 100644 --- a/include/osmocom/rspro/Makefile.am +++ b/include/osmocom/rspro/Makefile.am @@ -72,8 +72,3 @@ noinst_HEADERS+=per_decoder.h noinst_HEADERS+=per_encoder.h noinst_HEADERS+=per_opentype.h - -rspro_HEADERS = \ - rspro_client.h - -rsprodir = $(includedir)/osmocom/rspro diff --git a/include/osmocom/rspro/rspro_client.h b/include/osmocom/rspro/rspro_client.h deleted file mode 100644 index 76f3da6..0000000 --- a/include/osmocom/rspro/rspro_client.h +++ /dev/null @@ -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); -