client: Finish renaming client to conn in other places of the code

Change-Id: I3c7c499c921b03752cbbcdda3eac8ca360323a22

2 files changed, 29 insertions, 29 deletions

diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c
index 3debfc0..d1d39dc 100644
--- a/src/osmo_client_network.c
+++ b/src/osmo_client_network.c
@@ -44,19 +44,19 @@ static void _osmo_client_connect(void *_data)
 	osmo_client_connect((struct osmo_pcap_client_conn *) _data);
 }
 
-static void lost_connection(struct osmo_pcap_client_conn *client)
+static void lost_connection(struct osmo_pcap_client_conn *conn)
 {
-	if (client->wqueue.bfd.fd >= 0) {
-		osmo_tls_release(&client->tls_session);
-		osmo_fd_unregister(&client->wqueue.bfd);
-		close(client->wqueue.bfd.fd);
-		client->wqueue.bfd.fd = -1;
+	if (conn->wqueue.bfd.fd >= 0) {
+		osmo_tls_release(&conn->tls_session);
+		osmo_fd_unregister(&conn->wqueue.bfd);
+		close(conn->wqueue.bfd.fd);
+		conn->wqueue.bfd.fd = -1;
 	}
 
 
-	client->timer.cb = _osmo_client_connect;
-	client->timer.data = client;
-	osmo_timer_schedule(&client->timer, 2, 0);
+	conn->timer.cb = _osmo_client_connect;
+	conn->timer.data = conn;
+	osmo_timer_schedule(&conn->timer, 2, 0);
 }
 
 static void write_data(struct osmo_pcap_client_conn *conn, struct msgb *msg)
@@ -76,9 +76,9 @@ static int read_cb(struct osmo_fd *fd)
 
 	rc = read(fd->fd, buf, sizeof(buf));
 	if (rc <= 0) {
-		struct osmo_pcap_client_conn *client = fd->data;
+		struct osmo_pcap_client_conn *conn = fd->data;
 		LOGP(DCLIENT, LOGL_ERROR, "Lost connection on read.\n");
-		lost_connection(client);
+		lost_connection(conn);
 		return -1;
 	}
 
@@ -104,18 +104,18 @@ static int write_cb(struct osmo_fd *fd, struct msgb *msg)
 
 static void handshake_done_cb(struct osmo_tls_session *session)
 {
-	struct osmo_pcap_client_conn *client;
+	struct osmo_pcap_client_conn *conn;
 
-	client = container_of(session, struct osmo_pcap_client_conn, tls_session);
-	osmo_client_send_link(client);
+	conn = container_of(session, struct osmo_pcap_client_conn, tls_session);
+	osmo_client_send_link(conn);
 }
 
 static void tls_error_cb(struct osmo_tls_session *session)
 {
-	struct osmo_pcap_client_conn *client;
+	struct osmo_pcap_client_conn *conn;
 
-	client = container_of(session, struct osmo_pcap_client_conn, tls_session);
-	lost_connection(client);
+	conn = container_of(session, struct osmo_pcap_client_conn, tls_session);
+	lost_connection(conn);
 }
 
 void osmo_client_send_data(struct osmo_pcap_client_conn *conn,
@@ -235,7 +235,7 @@ void osmo_client_connect(struct osmo_pcap_client_conn *conn)
 	}
 }
 
-void osmo_client_reconnect(struct osmo_pcap_client_conn *client)
+void osmo_client_reconnect(struct osmo_pcap_client_conn *conn)
 {
-	lost_connection(client);
+	lost_connection(conn);
 }
diff --git a/src/osmo_tls.c b/src/osmo_tls.c
index 2cb1a87..0be01a6 100644
--- a/src/osmo_tls.c
+++ b/src/osmo_tls.c
@@ -281,39 +281,39 @@ int osmo_tls_client_bfd_cb(struct osmo_fd *fd, unsigned what)
 	return 0;
 }
 
-static int load_keys(struct osmo_pcap_client_conn *client)
+static int load_keys(struct osmo_pcap_client_conn *conn)
 {
-	struct osmo_tls_session *sess = &client->tls_session;
+	struct osmo_tls_session *sess = &conn->tls_session;
 	gnutls_datum_t data;
 	int rc;
 
-	if (!client->tls_client_cert || !client->tls_client_key) {
+	if (!conn->tls_client_cert || !conn->tls_client_key) {
 		LOGP(DTLS, LOGL_DEBUG, "Skipping x509 client cert %p %p\n",
-			client->tls_client_cert, client->tls_client_key);
+			conn->tls_client_cert, conn->tls_client_key);
 		return 0;
 	}
 
 
-	rc = gnutls_load_file(client->tls_client_cert, &data);
+	rc = gnutls_load_file(conn->tls_client_cert, &data);
 	if (rc < 0) {
 		LOGP(DTLS, LOGL_ERROR, "Failed to load file=%s rc=%d\n",
-			client->tls_client_cert, rc);
+			conn->tls_client_cert, rc);
 		return -1;
 	}
 	rc = gnutls_pcert_import_x509_raw(&sess->pcert, &data, GNUTLS_X509_FMT_PEM, 0);
 	gnutls_free(data.data);
 	if (rc < 0) {
 		LOGP(DTLS, LOGL_ERROR, "Failed to import file=%s rc=%d\n",
-			client->tls_client_cert, rc);
+			conn->tls_client_cert, rc);
 		return -1;
 	}
 	sess->pcert_alloc = true;
 
 	/* copied to RAM.. nothing we can do about it */
-	rc = gnutls_load_file(client->tls_client_key, &data);
+	rc = gnutls_load_file(conn->tls_client_key, &data);
 	if (rc < 0) {
 		LOGP(DTLS, LOGL_ERROR, "Failed to load file=%s rc=%d\n",
-			client->tls_client_key, rc);
+			conn->tls_client_key, rc);
 		return -1;
 	}
 	gnutls_privkey_init(&sess->privk);
@@ -321,7 +321,7 @@ static int load_keys(struct osmo_pcap_client_conn *client)
 	gnutls_free(data.data);
 	if (rc < 0) {
 		LOGP(DTLS, LOGL_ERROR, "Failed to load file=%s rc=%d\n",
-			client->tls_client_key, rc);
+			conn->tls_client_key, rc);
 		release_keys(sess);
 		return -1;
 	}