pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39301?usp=email ) Change subject: Rename osmo_pcap_server_close_conn -> osmo_pcap_conn_close ...................................................................... Rename osmo_pcap_server_close_conn -> osmo_pcap_conn_close While at it, remove unnecessary helper function close_connection(). Change-Id: I116f0c4d61d391faa30760be3afdf189ff921d0c --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c M src/osmo_server_vty.c 3 files changed, 9 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/01/39301/1 diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index bdb0b81..d91ffb3 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -169,4 +169,4 @@ void osmo_pcap_conn_free(struct osmo_pcap_conn *conn); void vty_server_init(void); void osmo_pcap_conn_close_trace(struct osmo_pcap_conn *conn); -void osmo_pcap_server_close_conn(struct osmo_pcap_conn *conn); +void osmo_pcap_conn_close(struct osmo_pcap_conn *conn); diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 30a89d5..b6e3be4 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -212,7 +212,7 @@ } } -static void close_connection(struct osmo_pcap_conn *conn) +void osmo_pcap_conn_close(struct osmo_pcap_conn *conn) { if (conn->rem_wq.bfd.fd >= 0) { osmo_fd_unregister(&conn->rem_wq.bfd); @@ -225,11 +225,6 @@ client_event(conn, "disconnect", NULL); } -void osmo_pcap_server_close_conn(struct osmo_pcap_conn *conn) -{ - return close_connection(conn); -} - /* Update conn->last_write if needed. This field is used to keep the last time * period where we wrote to the pcap file. Once a new write period (based on * rotation VTY config) is detected, the pcap file we write to is rotated. */ @@ -668,7 +663,7 @@ void osmo_pcap_conn_free(struct osmo_pcap_conn *conn) { - close_connection(conn); + osmo_pcap_conn_close(conn); llist_del(&conn->entry); talloc_free(conn); } @@ -903,7 +898,7 @@ conn = fd->data; rc = dispatch_read(conn); if (rc <= 0) - close_connection(conn); + osmo_pcap_conn_close(conn); return 0; } @@ -911,7 +906,7 @@ { struct osmo_pcap_conn *conn; conn = container_of(session, struct osmo_pcap_conn, tls_session); - close_connection(conn); + osmo_pcap_conn_close(conn); } static int tls_read_cb(struct osmo_tls_session *session) @@ -946,7 +941,7 @@ static void new_connection(struct osmo_pcap_server *server, struct osmo_pcap_conn *client, int new_fd) { - close_connection(client); + osmo_pcap_conn_close(client); TALLOC_FREE(client->file_hdr); client->file_hdr_len = 0; @@ -968,11 +963,11 @@ LOGP(DSERVER, LOGL_NOTICE, "Require TLS but not enabled on conn=%s\n", client->name); - close_connection(client); + osmo_pcap_conn_close(client); return; } else if (client->tls_use) { if (!osmo_tls_init_server_session(client, server)) { - close_connection(client); + osmo_pcap_conn_close(client); return; } client->tls_session.error = tls_error_cb; diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index c019657..eab5cb4 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -372,7 +372,7 @@ if (use_tls) { /* force moving to TLS */ if (!conn->tls_use) - osmo_pcap_server_close_conn(conn); + osmo_pcap_conn_close(conn); conn->tls_use = true; } else { conn->tls_use = false; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39301?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I116f0c4d61d391faa30760be3afdf189ff921d0c Gerrit-Change-Number: 39301 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt;