There was a lot of similarity between the bankd_client_fsm (for the client->bankd RSPRO connection) and the rspro_client_fsm (for the client->server and the bankd->server RSPRO connections). With the last few commits introducing the missing features to rspro_client_fsm, we can completely obsolete bankd_client_fsm and further simplify the codebase. Change-Id: Icbe9881a0391fcd0c47e5d930dc764fc0cb1dfbfchanges/87/16587/2
parent
a3b14d1890
commit
3e9860bb77
@ -1,278 +0,0 @@ |
||||
/* (C) 2018-2019 by Harald Welte <laforge@gnumonks.org>
|
||||
* |
||||
* All Rights Reserved |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
* |
||||
* 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 2 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, write to the Free Software Foundation, Inc., |
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
||||
* |
||||
*/ |
||||
#include <stdint.h> |
||||
#include <string.h> |
||||
#include <errno.h> |
||||
|
||||
#include <talloc.h> |
||||
|
||||
#include <osmocom/core/logging.h> |
||||
#include <osmocom/core/utils.h> |
||||
#include <osmocom/core/msgb.h> |
||||
#include <osmocom/core/fsm.h> |
||||
|
||||
#include <osmocom/abis/ipa.h> |
||||
#include <osmocom/gsm/protocol/ipaccess.h> |
||||
|
||||
#include "client.h" |
||||
#include "rspro_util.h" |
||||
|
||||
#define S(x) (1 << (x)) |
||||
|
||||
static void bankd_updown_cb(struct ipa_client_conn *conn, int up) |
||||
{ |
||||
struct bankd_client *bc = conn->data; |
||||
|
||||
printf("RSPRO link to %s:%d %s\n", conn->addr, conn->port, up ? "UP" : "DOWN"); |
||||
|
||||
osmo_fsm_inst_dispatch(bc->bankd_fi, up ? BDC_E_TCP_UP: BDC_E_TCP_DOWN, 0); |
||||
} |
||||
|
||||
/* internal function, bypassing FSM state */ |
||||
static int _bankd_conn_send_rspro(struct bankd_client *bc, RsproPDU_t *rspro) |
||||
{ |
||||
return ipa_client_conn_send_rspro(bc->bankd_conn, rspro); |
||||
} |
||||
|
||||
int bankd_conn_send_rspro(struct bankd_client *bc, RsproPDU_t *rspro) |
||||
{ |
||||
if (osmo_fsm_inst_dispatch(bc->bankd_fi, BDC_E_RSPRO_TX, rspro) < 0) { |
||||
ASN_STRUCT_FREE(asn_DEF_RsproPDU, rspro); |
||||
return -1; |
||||
} |
||||
return 0; |
||||
} |
||||
|
||||
/***********************************************************************
|
||||
* client-side FSM for RSPRO connection to remsim-bankd |
||||
* |
||||
* This is part of remsim-client and manages the connection to remsim-bankd, |
||||
* over which actual TPDU exchanges happen. |
||||
***********************************************************************/ |
||||
|
||||
enum bankd_conn_fsm_state { |
||||
/* waiting for initial connection to remsim-bankd */ |
||||
BDC_ST_INIT, |
||||
/* bankd connection established, waiting for ClientConnectRes */ |
||||
BDC_ST_ESTABLISHED, |
||||
/* bankd connection established, ClientConnect succeeded */ |
||||
BDC_ST_CONNECTED, |
||||
/* connection lost, we're waiting for a re-establish */ |
||||
BDC_ST_REESTABLISH, |
||||
}; |
||||
|
||||
static const struct value_string remsim_client_bankd_fsm_event_names[] = { |
||||
OSMO_VALUE_STRING(BDC_E_ESTABLISH), |
||||
OSMO_VALUE_STRING(BDC_E_TCP_UP), |
||||
OSMO_VALUE_STRING(BDC_E_TCP_DOWN), |
||||
OSMO_VALUE_STRING(BDC_E_CLIENT_CONN_RES), |
||||
OSMO_VALUE_STRING(BDC_E_RSPRO_TX), |
||||
{ 0, NULL } |
||||
}; |
||||
|
||||
#define T1_WAIT_CLIENT_CONN_RES 10 |
||||
#define T2_RECONNECT 10 |
||||
|
||||
|
||||
static void bdc_st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) |
||||
{ |
||||
switch (event) { |
||||
case BDC_E_ESTABLISH: |
||||
osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); |
||||
break; |
||||
default: |
||||
OSMO_ASSERT(0); |
||||
} |
||||
} |
||||
|
||||
static void bdc_st_established_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) |
||||
{ |
||||
struct bankd_client *bc = (struct bankd_client *) fi->priv; |
||||
RsproPDU_t *pdu; |
||||
|
||||
/* Send ClientConnReq */ |
||||
pdu = rspro_gen_ConnectClientReq(&bc->srv_conn.own_comp_id, bc->srv_conn.clslot); |
||||
_bankd_conn_send_rspro(bc, pdu); |
||||
} |
||||
|
||||
static void bdc_st_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) |
||||
{ |
||||
switch (event) { |
||||
case BDC_E_TCP_DOWN: |
||||
osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); |
||||
break; |
||||
case BDC_E_CLIENT_CONN_RES: |
||||
/* somehow notify the main code? */ |
||||
osmo_fsm_inst_state_chg(fi, BDC_ST_CONNECTED, 0, 0); |
||||
break; |
||||
default: |
||||
OSMO_ASSERT(0); |
||||
} |
||||
} |
||||
|
||||
static void bdc_st_connected(struct osmo_fsm_inst *fi, uint32_t event, void *data) |
||||
{ |
||||
struct bankd_client *bc = (struct bankd_client *) fi->priv; |
||||
RsproPDU_t *pdu = NULL; |
||||
|
||||
switch (event) { |
||||
case BDC_E_TCP_DOWN: |
||||
osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); |
||||
break; |
||||
case BDC_E_RSPRO_TX: |
||||
pdu = data; |
||||
_bankd_conn_send_rspro(bc, pdu); |
||||
break; |
||||
default: |
||||
OSMO_ASSERT(0); |
||||
} |
||||
} |
||||
|
||||
static void bdc_st_reestablish_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) |
||||
{ |
||||
struct bankd_client *bc = (struct bankd_client *) fi->priv; |
||||
int rc; |
||||
|
||||
/* re-create bankd_conn */ |
||||
if (bc->bankd_conn) { |
||||
LOGPFSML(fi, LOGL_INFO, "Destroying existing connection to bankd\n"); |
||||
ipa_client_conn_close(bc->bankd_conn); |
||||
ipa_client_conn_destroy(bc->bankd_conn); |
||||
bc->bankd_conn = NULL; |
||||
} |
||||
LOGPFSML(fi, LOGL_INFO, "Creating TCP connection to bankd at %s:%u\n", |
||||
bc->bankd_host, bc->bankd_port); |
||||
bc->bankd_conn = ipa_client_conn_create(bc, NULL, 0, bc->bankd_host, bc->bankd_port, |
||||
bankd_updown_cb, bankd_read_cb, NULL, bc); |
||||
if (!bc->bankd_conn) { |
||||
fprintf(stderr, "Unable to create socket: %s\n", strerror(errno)); |
||||
exit(1); |
||||
} |
||||
|
||||
/* Attempt to connect TCP socket */ |
||||
rc = ipa_client_conn_open(bc->bankd_conn); |
||||
if (rc < 0) { |
||||
fprintf(stderr, "Unable to connect RSPRO to %s:%d - %s\n", |
||||
bc->bankd_conn->addr, bc->bankd_conn->port, strerror(errno)); |
||||
/* FIXME: retry? Timer? Abort? */ |
||||
OSMO_ASSERT(0); |
||||
} |
||||
} |
||||
|
||||
static void bdc_st_reestablish(struct osmo_fsm_inst *fi, uint32_t event, void *data) |
||||
{ |
||||
switch (event) { |
||||
case BDC_E_TCP_UP: |
||||
osmo_fsm_inst_state_chg(fi, BDC_ST_ESTABLISHED, T1_WAIT_CLIENT_CONN_RES, 1); |
||||
break; |
||||
case BDC_E_TCP_DOWN: |
||||
/* wait for normal T2 timeout */ |
||||
break; |
||||
default: |
||||
OSMO_ASSERT(0); |
||||
} |
||||
} |
||||
|
||||
static void bdc_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) |
||||
{ |
||||
switch (event) { |
||||
case BDC_E_ESTABLISH: |
||||
osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); |
||||
break; |
||||
default: |
||||
OSMO_ASSERT(0); |
||||
} |
||||
} |
||||
|
||||
static int remsim_client_bankd_fsm_timer_cb(struct osmo_fsm_inst *fi) |
||||
{ |
||||
switch (fi->T) { |
||||
case 2: |
||||
/* TCP reconnect failed: retry */ |
||||
osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); |
||||
break; |
||||
case 1: |
||||
/* no ClientConnectRes received: disconnect + reconnect */ |
||||
osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); |
||||
break; |
||||
default: |
||||
OSMO_ASSERT(0); |
||||
} |
||||
return 0; |
||||
} |
||||
|
||||
static const struct osmo_fsm_state bankd_conn_fsm_states[] = { |
||||
[BDC_ST_INIT] = { |
||||
.name = "INIT", |
||||
.in_event_mask = 0, /* S(BDC_E_ESTABLISH) via allstate */ |
||||
.out_state_mask = S(BDC_ST_REESTABLISH), |
||||
.action = bdc_st_init, |
||||
}, |
||||
[BDC_ST_ESTABLISHED] = { |
||||
.name = "ESTABLISHED", |
||||
.in_event_mask = S(BDC_E_TCP_DOWN) | S(BDC_E_CLIENT_CONN_RES), |
||||
.out_state_mask = S(BDC_ST_CONNECTED) | S(BDC_ST_REESTABLISH), |
||||
.action = bdc_st_established, |
||||
.onenter = bdc_st_established_onenter, |
||||
}, |
||||
[BDC_ST_CONNECTED] = { |
||||
.name = "CONNECTED", |
||||
.in_event_mask = S(BDC_E_TCP_DOWN) | S(BDC_E_RSPRO_TX), |
||||
.out_state_mask = S(BDC_ST_REESTABLISH), |
||||
.action = bdc_st_connected, |
||||
}, |
||||
[BDC_ST_REESTABLISH] = { |
||||
.name = "REESTABLISH", |
||||
.in_event_mask = S(BDC_E_TCP_UP) | S(BDC_E_TCP_DOWN), |
||||
.out_state_mask = S(BDC_ST_ESTABLISHED) | S(BDC_ST_REESTABLISH), |
||||
.action = bdc_st_reestablish, |
||||
.onenter = bdc_st_reestablish_onenter, |
||||
}, |
||||
}; |
||||
|
||||
struct osmo_fsm remsim_client_bankd_fsm = { |
||||
.name = "BANKD_CONN", |
||||
.states = bankd_conn_fsm_states, |
||||
.num_states = ARRAY_SIZE(bankd_conn_fsm_states), |
||||
.allstate_event_mask = S(BDC_E_ESTABLISH), |
||||
.allstate_action = bdc_allstate_action, |
||||
.timer_cb = remsim_client_bankd_fsm_timer_cb, |
||||
.log_subsys = DMAIN, |
||||
.event_names = remsim_client_bankd_fsm_event_names, |
||||
}; |
||||
|
||||
int bankd_conn_fsm_alloc(struct bankd_client *bc) |
||||
{ |
||||
struct osmo_fsm_inst *fi; |
||||
|
||||
fi = osmo_fsm_inst_alloc(&remsim_client_bankd_fsm, bc, bc, LOGL_DEBUG, "bankd"); |
||||
if (!fi) |
||||
return -1; |
||||
|
||||
bc->bankd_fi = fi; |
||||
return 0; |
||||
} |
||||
|
||||
static __attribute__((constructor)) void on_dso_load(void) |
||||
{ |
||||
OSMO_ASSERT(osmo_fsm_register(&remsim_client_bankd_fsm) == 0); |
||||
} |
||||
Loading…
Reference in new issue