pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39168?usp=email ) Change subject: pcap-client: Add missing '_conn' in function names ...................................................................... pcap-client: Add missing '_conn' in function names Change-Id: Ide92b28938b89ea1130d89dd0243607c861045f2 --- M include/osmo-pcap/osmo_pcap_client.h M src/osmo_client_core.c M src/osmo_client_main.c M src/osmo_client_network.c M src/osmo_client_vty.c 5 files changed, 30 insertions(+), 32 deletions(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 159e6ae..ce2fb8f 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -114,16 +114,14 @@ int osmo_client_capture(struct osmo_pcap_client *client, const char *device); int osmo_client_filter(struct osmo_pcap_client *client, const char *filter); -void osmo_client_send_data(struct osmo_pcap_client_conn *client, - struct pcap_pkthdr *hdr, const uint8_t *data); -void osmo_client_send_link(struct osmo_pcap_client_conn *client); -void osmo_client_connect(struct osmo_pcap_client_conn *); -void osmo_client_disconnect(struct osmo_pcap_client_conn *); -void osmo_client_free(struct osmo_pcap_client_conn *); - -void osmo_client_reconnect(struct osmo_pcap_client_conn *); - struct osmo_pcap_client_conn *osmo_client_find_or_create_conn(struct osmo_pcap_client *, const char *name); struct osmo_pcap_client_conn *osmo_client_find_conn(struct osmo_pcap_client *, const char *name); struct osmo_pcap_client_conn *osmo_client_conn_alloc(struct osmo_pcap_client *client, const char *name); +void osmo_client_conn_free(struct osmo_pcap_client_conn *conn); +void osmo_client_conn_send_data(struct osmo_pcap_client_conn *conn, + struct pcap_pkthdr *hdr, const uint8_t *data); +void osmo_client_conn_send_link(struct osmo_pcap_client_conn *conn); +void osmo_client_conn_connect(struct osmo_pcap_client_conn *conn); +void osmo_client_conn_disconnect(struct osmo_pcap_client_conn *conn); +void osmo_client_conn_reconnect(struct osmo_pcap_client_conn *conn); diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 931dd98..e6e5a38 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -169,7 +169,7 @@ return 0; llist_for_each_entry(conn, &client->conns, entry) - osmo_client_send_data(conn, &hdr, data); + osmo_client_conn_send_data(conn, &hdr, data); return 0; } @@ -318,7 +318,7 @@ pcap_check_stats_cb(client); llist_for_each_entry(conn, &client->conns, entry) - osmo_client_send_link(conn); + osmo_client_conn_send_link(conn); if (client->filter_string) { osmo_install_filter(client); @@ -348,9 +348,9 @@ return client; } -void osmo_client_free(struct osmo_pcap_client_conn *conn) +void osmo_client_conn_free(struct osmo_pcap_client_conn *conn) { - osmo_client_disconnect(conn); + osmo_client_conn_disconnect(conn); llist_del(&conn->entry); talloc_free(conn); } diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index d8d7a07..c7af965 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -286,7 +286,7 @@ /* attempt to connect to the remote */ if (pcap_client->conn->srv_ip && pcap_client->conn->srv_port > 0) - osmo_client_connect(pcap_client->conn); + osmo_client_conn_connect(pcap_client->conn); if (daemonize) { rc = osmo_daemonize(); diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index 9a430ab..52246d4 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -42,16 +42,16 @@ #include <string.h> #include <unistd.h> -static void _osmo_client_connect(void *_data) +static void _osmo_client_conn_connect(void *_data) { - osmo_client_connect((struct osmo_pcap_client_conn *) _data); + osmo_client_conn_connect((struct osmo_pcap_client_conn *) _data); } static void lost_connection(struct osmo_pcap_client_conn *conn) { - osmo_client_disconnect(conn); + osmo_client_conn_disconnect(conn); - conn->timer.cb = _osmo_client_connect; + conn->timer.cb = _osmo_client_conn_connect; conn->timer.data = conn; osmo_timer_schedule(&conn->timer, 2, 0); } @@ -107,7 +107,7 @@ conn = container_of(session, struct osmo_pcap_client_conn, tls_session); osmo_wqueue_clear(&conn->wqueue); - osmo_client_send_link(conn); + osmo_client_conn_send_link(conn); } static void tls_error_cb(struct osmo_tls_session *session) @@ -141,7 +141,7 @@ conn->wqueue.bfd.cb = osmo_wqueue_bfd_cb; conn->wqueue.bfd.data = conn; osmo_wqueue_clear(&conn->wqueue); - osmo_client_send_link(conn); + osmo_client_conn_send_link(conn); } } @@ -162,8 +162,8 @@ } } -void osmo_client_send_data(struct osmo_pcap_client_conn *conn, - struct pcap_pkthdr *in_hdr, const uint8_t *data) +void osmo_client_conn_send_data(struct osmo_pcap_client_conn *conn, + struct pcap_pkthdr *in_hdr, const uint8_t *data) { struct osmo_pcap_data *om_hdr; struct osmo_pcap_pkthdr *hdr; @@ -224,7 +224,7 @@ write_data(conn, msg); } -void osmo_client_send_link(struct osmo_pcap_client_conn *conn) +void osmo_client_conn_send_link(struct osmo_pcap_client_conn *conn) { struct pcap_file_header *hdr; struct osmo_pcap_data *om_hdr; @@ -263,14 +263,14 @@ write_data(conn, msg); } -void osmo_client_connect(struct osmo_pcap_client_conn *conn) +void osmo_client_conn_connect(struct osmo_pcap_client_conn *conn) { int rc; uint16_t srv_port; int sock_type, sock_proto; unsigned int when; - osmo_client_disconnect(conn); + osmo_client_conn_disconnect(conn); conn->wqueue.read_cb = read_cb; conn->wqueue.write_cb = write_cb; @@ -309,12 +309,12 @@ rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_CONNECT)); } -void osmo_client_reconnect(struct osmo_pcap_client_conn *conn) +void osmo_client_conn_reconnect(struct osmo_pcap_client_conn *conn) { lost_connection(conn); } -void osmo_client_disconnect(struct osmo_pcap_client_conn *conn) +void osmo_client_conn_disconnect(struct osmo_pcap_client_conn *conn) { if (conn->wqueue.bfd.fd >= 0) { osmo_tls_release(&conn->tls_session); diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index 8888e66..84f7e05 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -230,7 +230,7 @@ if (!conn->tls_on) { if (conn->wqueue.bfd.fd >= 0) - osmo_client_reconnect(conn); + osmo_client_conn_reconnect(conn); } conn->tls_on = true; @@ -245,7 +245,7 @@ struct osmo_pcap_client_conn *conn = get_conn(vty); if (conn->tls_on) - osmo_client_reconnect(conn); + osmo_client_conn_reconnect(conn); conn->tls_on = false; return CMD_SUCCESS; @@ -471,7 +471,7 @@ return CMD_WARNING; } - osmo_client_free(conn); + osmo_client_conn_free(conn); return CMD_SUCCESS; } @@ -482,7 +482,7 @@ { struct osmo_pcap_client_conn *conn = get_conn(vty); - osmo_client_connect(conn); + osmo_client_conn_connect(conn); return CMD_SUCCESS; } @@ -493,7 +493,7 @@ { struct osmo_pcap_client_conn *conn = get_conn(vty); - osmo_client_disconnect(conn); + osmo_client_conn_disconnect(conn); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39168?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: Ide92b28938b89ea1130d89dd0243607c861045f2 Gerrit-Change-Number: 39168 Gerrit-PatchSet: 2 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt;