From ac9cc8f21ddeb821134e657f509bb83cec8c1da4 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 11 Mar 2022 00:30:14 +0100 Subject: [PATCH] net: Rename para_connect_simple() -> para_connect(). We used to have para_connect() at some point (hence the need for the _simple suffix), but it was removed long ago. --- client_common.c | 2 +- http_recv.c | 2 +- net.h | 3 +-- udp_send.c | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client_common.c b/client_common.c index f476a1c4..9bcfcb82 100644 --- a/client_common.c +++ b/client_common.c @@ -484,7 +484,7 @@ int client_connect(struct client_task *ct, struct sched *s, PARA_NOTICE_LOG("connecting %s:%u\n", host, port); ct->scc.fd = -1; - ret = para_connect_simple(IPPROTO_TCP, host, port); + ret = para_connect(IPPROTO_TCP, host, port); if (ret < 0) return ret; ct->scc.fd = ret; diff --git a/http_recv.c b/http_recv.c index 5aafacb8..32c9e7b9 100644 --- a/http_recv.c +++ b/http_recv.c @@ -150,7 +150,7 @@ static int http_recv_open(struct receiver_node *rn) struct lls_parse_result *lpr = rn->lpr; const char *r_i = RECV_CMD_OPT_STRING_VAL(HTTP, HOST, lpr); uint32_t r_p = RECV_CMD_OPT_UINT32_VAL(HTTP, PORT, lpr); - int fd, ret = para_connect_simple(IPPROTO_TCP, r_i, r_p); + int fd, ret = para_connect(IPPROTO_TCP, r_i, r_p); if (ret < 0) return ret; diff --git a/net.h b/net.h index d19ceb9e..e71fe311 100644 --- a/net.h +++ b/net.h @@ -40,8 +40,7 @@ int makesock(unsigned l4type, bool passive, const char *host, int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai, struct flowopts *fo); -static inline int para_connect_simple(unsigned l4type, - const char *host, uint16_t port) +static inline int para_connect(unsigned l4type, const char *host, uint16_t port) { return makesock(l4type, 0, host, port, NULL); } diff --git a/udp_send.c b/udp_send.c index 28947987..fe001025 100644 --- a/udp_send.c +++ b/udp_send.c @@ -187,7 +187,7 @@ static int udp_resolve_target(const char *url, struct sender_command_data *scd) return ret; port = scd->port > 0 ? scd->port : OPT_UINT32_VAL(UDP_DEFAULT_PORT); - ret = para_connect_simple(IPPROTO_UDP, scd->host, port); + ret = para_connect(IPPROTO_UDP, scd->host, port); if (ret < 0) return ret; @@ -336,7 +336,7 @@ static int udp_com_add(struct sender_command_data *scd) sc->private_data = ut; sc->fd = -1; - ret = para_connect_simple(IPPROTO_UDP, scd->host, scd->port); + ret = para_connect(IPPROTO_UDP, scd->host, scd->port); if (ret < 0) goto err; sc->fd = ret; -- 2.39.2