diff --git a/src/client.h b/src/client.h index 3046f8b..b4e4672 100644 --- a/src/client.h +++ b/src/client.h @@ -44,6 +44,6 @@ struct bankd_client { struct osmo_fsm_inst *bankd_fi; }; -void bankd_send_rspro(struct bankd_client *bc, RsproPDU_t *rspro); +void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro); int bankd_read_cb(struct ipa_client_conn *conn, struct msgb *msg); int bankd_conn_fsm_alloc(struct bankd_client *bc); diff --git a/src/remsim_client.c b/src/remsim_client.c index 0189f59..7cef7f9 100644 --- a/src/remsim_client.c +++ b/src/remsim_client.c @@ -16,19 +16,19 @@ #include "rspro_util.h" #include "client.h" -static void bankd_send(struct bankd_client *bc, struct msgb *msg_tx) +static void push_and_send(struct ipa_client_conn *ipa, 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(bc->bankd_conn, msg_tx); + ipa_client_conn_send(ipa, msg_tx); /* msg_tx is now queued and will be freed. */ } -void bankd_send_rspro(struct bankd_client *bc, RsproPDU_t *rspro) +void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) { struct msgb *msg = rspro_enc_msg(rspro); OSMO_ASSERT(msg); - bankd_send(bc, msg); + push_and_send(ipa, msg); } static int bankd_handle_msg(struct bankd_client *bc, struct msgb *msg) diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c index 89b95de..75d4af7 100644 --- a/src/remsim_client_fsm.c +++ b/src/remsim_client_fsm.c @@ -91,7 +91,7 @@ static void bdc_st_established_onenter(struct osmo_fsm_inst *fi, uint32_t prev_s /* FIXME: Send ClientConnReq */ const ClientSlot_t clslot = { .clientId = 23, .slotNr = 1 }; pdu = rspro_gen_ConnectClientReq(&bc->own_comp_id, &clslot); - bankd_send_rspro(bc, pdu); + ipa_client_conn_send_rspro(bc->bankd_conn, pdu); } static void bdc_st_established(struct osmo_fsm_inst *fi, uint32_t event, void *data)