pespin has uploaded this change for review.

View Change

server: Rename osmo_pcap_server_close_trace -> osmo_pcap_conn_close_trace

Change-Id: I261c6a54bd31b8f511cb103840323e7343bfdc61
---
M include/osmo-pcap/osmo_pcap_server.h
M src/osmo_server_network.c
M src/osmo_server_vty.c
3 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/00/39300/1

diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h
index f44781a..bdb0b81 100644
--- a/include/osmo-pcap/osmo_pcap_server.h
+++ b/include/osmo-pcap/osmo_pcap_server.h
@@ -168,5 +168,5 @@
 					     const char *name);
 void osmo_pcap_conn_free(struct osmo_pcap_conn *conn);
 void vty_server_init(void);
-void osmo_pcap_server_close_trace(struct osmo_pcap_conn *conn);
+void osmo_pcap_conn_close_trace(struct osmo_pcap_conn *conn);
 void osmo_pcap_server_close_conn(struct osmo_pcap_conn *conn);
diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c
index ac8aff6..30a89d5 100644
--- a/src/osmo_server_network.c
+++ b/src/osmo_server_network.c
@@ -194,7 +194,7 @@
 	talloc_free(curr_filename_cpy_dname);
 }
 
-void osmo_pcap_server_close_trace(struct osmo_pcap_conn *conn)
+void osmo_pcap_conn_close_trace(struct osmo_pcap_conn *conn)
 {
 	if (conn->local_fd >= 0) {
 		close(conn->local_fd);
@@ -221,7 +221,7 @@
 		osmo_tls_release(&conn->tls_session);
 	}
 
-	osmo_pcap_server_close_trace(conn);
+	osmo_pcap_conn_close_trace(conn);
 	client_event(conn, "disconnect", NULL);
 }
 
@@ -252,7 +252,7 @@
 	int rc;
 	char *real_base_path;
 
-	osmo_pcap_server_close_trace(conn);
+	osmo_pcap_conn_close_trace(conn);
 
 	/* omit any storing/creation of the file */
 	if (!conn->store) {
diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c
index 9ba5f74..c019657 100644
--- a/src/osmo_server_vty.c
+++ b/src/osmo_server_vty.c
@@ -366,7 +366,7 @@
 
 	/* Checking store and maybe closing a pcap file */
 	if (!store)
-		osmo_pcap_server_close_trace(conn);
+		osmo_pcap_conn_close_trace(conn);
 	conn->store = store;
 
 	if (use_tls) {

To view, visit change 39300. To unsubscribe, or for help writing mail filters, visit settings.