[S] Change in osmo-remsim[master]: rspro_client: Make struct osmo_rspro_client private

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39021?usp=email ) Change subject: rspro_client: Make struct osmo_rspro_client private ...................................................................... rspro_client: Make struct osmo_rspro_client private That struct contains lots of implementation specific fields we may want to change in the future, like the current use to ipa_client_conn which will eventually be deprecated. Related: OS#5896 Change-Id: I3bacae853101a79804553175ebd4482acb188597 --- M include/osmocom/rspro/rspro_client.h M src/rspro_client_fsm.h 2 files changed, 13 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/21/39021/1 diff --git a/include/osmocom/rspro/rspro_client.h b/include/osmocom/rspro/rspro_client.h index 76f3da6..0a9f587 100644 --- a/include/osmocom/rspro/rspro_client.h +++ b/include/osmocom/rspro/rspro_client.h @@ -34,19 +34,6 @@ /* 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, diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index 55fe4a4..dfed2db 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -3,6 +3,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/abis/ipa.h> #include <osmocom/rspro/RsproPDU.h> +#include <osmocom/rspro/rspro_client.h> #include "rspro_util.h" @@ -17,7 +18,18 @@ SRVC_E_RSPRO_TX /* transmit a RSPRO PDU to the peer */ }; -struct rspro_server_conn; +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; +}; /* representing a client-side connection to a RSPRO server */ struct rspro_server_conn { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39021?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I3bacae853101a79804553175ebd4482acb188597 Gerrit-Change-Number: 39021 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt;