This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16626 ) Change subject: remsim-client: Move client_cnfig from .c to .h file ...................................................................... remsim-client: Move client_cnfig from .c to .h file Change-Id: I158fe0f2791c164adc74cf851d5a139990bce852 --- M src/client/client.h M src/client/simtrace2-remsim_client.c 2 files changed, 31 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/26/16626/1 diff --git a/src/client/client.h b/src/client/client.h index f36e2e3..7cc7ec1 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -13,6 +13,35 @@ struct cardem_inst; +#define ATR_SIZE_MAX 55 +struct client_config { + char *server_host; + int server_port; + + int client_id; + int client_slot; + + char *gsmtap_host; + bool keep_running; + + char *event_script; + + struct { + uint8_t data[ATR_SIZE_MAX]; + uint8_t len; + } atr; + + struct { + int vendor_id; + int product_id; + int config_id; + int if_num; + int altsetting; + int addr; + char *path; + } usb; +}; + struct bankd_client { /* connection to the remsim-server (control) */ struct rspro_server_conn srv_conn; @@ -24,5 +53,6 @@ struct bank_slot bankd_slot; + struct client_config *cfg; struct cardem_inst *cardem; }; diff --git a/src/client/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c index 190eb90..515fd50 100644 --- a/src/client/simtrace2-remsim_client.c +++ b/src/client/simtrace2-remsim_client.c @@ -844,33 +844,6 @@ ); } -#define ATR_SIZE_MAX 55 -struct client_config { - char *server_host; - int server_port; - - int client_id; - int client_slot; - - char *gsmtap_host; - bool keep_running; - - struct { - uint8_t data[ATR_SIZE_MAX]; - uint8_t len; - } atr; - - struct { - int vendor_id; - int product_id; - int config_id; - int if_num; - int altsetting; - int addr; - char *path; - } usb; -}; - static struct client_config *client_config_init(void *ctx) { struct client_config *cfg = talloc_zero(ctx, struct client_config); @@ -1152,6 +1125,7 @@ // initialize remote SIM client g_client = talloc_zero(g_tall_ctx, struct bankd_client); + g_client->cfg = cfg; g_client->cardem = g_ci; if (cfg->client_id != -1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I158fe0f2791c164adc74cf851d5a139990bce852 Gerrit-Change-Number: 16626 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge at osmocom.org> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191217/c5bca83b/attachment.htm>