pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39305?usp=email ) Change subject: server: Move osmo_pcap_server_alloc() to osmo_server_core.c ...................................................................... server: Move osmo_pcap_server_alloc() to osmo_server_core.c Change-Id: I5456e66820cec5bd5acf3cb732b47c42dae7a21e --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_core.c M src/osmo_server_main.c 3 files changed, 32 insertions(+), 30 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index 5d21c64..8bd1dee 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -116,6 +116,15 @@ struct osmo_tls_session tls_session; }; +void osmo_pcap_conn_free(struct osmo_pcap_conn *conn); +void vty_server_init(void); +void osmo_pcap_conn_close(struct osmo_pcap_conn *conn); +int osmo_pcap_conn_process_data(struct osmo_pcap_conn *conn, const uint8_t *data, size_t len); +void osmo_pcap_conn_restart_trace(struct osmo_pcap_conn *conn); +void osmo_pcap_conn_close_trace(struct osmo_pcap_conn *conn); +void osmo_pcap_conn_event(struct osmo_pcap_conn *conn, + const char *event, const char *data); + struct osmo_pcap_server { struct llist_head conn; @@ -163,16 +172,9 @@ extern struct osmo_pcap_server *pcap_server; extern const struct rate_ctr_group_desc pcap_peer_group_desc; extern const struct rate_ctr_group_desc pcap_server_group_desc; +struct osmo_pcap_server *osmo_pcap_server_alloc(void *ctx); void osmo_pcap_server_reopen(struct osmo_pcap_server *server); int osmo_pcap_server_listen(struct osmo_pcap_server *server); struct osmo_pcap_conn *osmo_pcap_server_find_or_create(struct osmo_pcap_server *ser, const char *name); -void osmo_pcap_conn_free(struct osmo_pcap_conn *conn); -void vty_server_init(void); -void osmo_pcap_conn_close(struct osmo_pcap_conn *conn); -int osmo_pcap_conn_process_data(struct osmo_pcap_conn *conn, const uint8_t *data, size_t len); -void osmo_pcap_conn_restart_trace(struct osmo_pcap_conn *conn); -void osmo_pcap_conn_close_trace(struct osmo_pcap_conn *conn); -void osmo_pcap_conn_event(struct osmo_pcap_conn *conn, - const char *event, const char *data); diff --git a/src/osmo_server_core.c b/src/osmo_server_core.c index cf526a1..5b9c2d4 100644 --- a/src/osmo_server_core.c +++ b/src/osmo_server_core.c @@ -594,3 +594,25 @@ update_last_write(conn, now, rc); return 0; } + +struct osmo_pcap_server *osmo_pcap_server_alloc(void *ctx) +{ + struct osmo_pcap_server *psrv = talloc_zero(ctx, struct osmo_pcap_server); + OSMO_ASSERT(psrv); + + psrv->ctrg = rate_ctr_group_alloc(psrv, &pcap_server_group_desc, 0); + OSMO_ASSERT(psrv->ctrg); + + INIT_LLIST_HEAD(&psrv->conn); + psrv->base_path = talloc_strdup(psrv, "./"); + OSMO_ASSERT(psrv->base_path); + psrv->permission_mask = 0440; + psrv->max_size = 1073741824; /* 1024^3, 1GB **/ + psrv->max_size_enabled = true; + psrv->max_snaplen = DEFAULT_SNAPLEN; + /* By default rotate daily: */ + psrv->rotate_localtime.enabled = true; + psrv->rotate_localtime.intv = TIME_INTERVAL_DAY; + psrv->rotate_localtime.modulus = 1; + return psrv; +} diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 74d2727..49ee449 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -204,28 +204,6 @@ msgb_talloc_ctx_init(tall_srv_ctx, 0); } -static struct osmo_pcap_server *osmo_pcap_server_alloc(void *ctx) -{ - struct osmo_pcap_server *psrv = talloc_zero(ctx, struct osmo_pcap_server); - OSMO_ASSERT(psrv); - - psrv->ctrg = rate_ctr_group_alloc(psrv, &pcap_server_group_desc, 0); - OSMO_ASSERT(psrv->ctrg); - - INIT_LLIST_HEAD(&psrv->conn); - psrv->base_path = talloc_strdup(psrv, "./"); - OSMO_ASSERT(psrv->base_path); - psrv->permission_mask = 0440; - psrv->max_size = 1073741824; /* 1024^3, 1GB **/ - psrv->max_size_enabled = true; - psrv->max_snaplen = DEFAULT_SNAPLEN; - /* By default rotate daily: */ - psrv->rotate_localtime.enabled = true; - psrv->rotate_localtime.intv = TIME_INTERVAL_DAY; - psrv->rotate_localtime.modulus = 1; - return psrv; -} - int main(int argc, char **argv) { int rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I5456e66820cec5bd5acf3cb732b47c42dae7a21e Gerrit-Change-Number: 39305 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>