From c59170241676d156356ff4f2f04cee89321c65e2 Mon Sep 17 00:00:00 2001 From: defanor Date: Sat, 29 Feb 2020 23:49:27 +0300 Subject: Use uint16_t for port numbers --- src/rexmpp.c | 4 ++-- src/rexmpp_tcp.c | 2 +- src/rexmpp_tcp.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rexmpp.c b/src/rexmpp.c index c9ec44e..6061bc0 100644 --- a/src/rexmpp.c +++ b/src/rexmpp.c @@ -661,7 +661,7 @@ void rexmpp_process_conn_err (rexmpp_t *s, int err); void rexmpp_try_next_host (rexmpp_t *s) { const char *host; - int port; + uint16_t port; /* todo: check priorities and weights */ s->tls_state = REXMPP_TLS_INACTIVE; if (s->server_srv_tls != NULL && s->server_srv_tls_cur == NULL) { @@ -822,7 +822,7 @@ void rexmpp_after_srv (rexmpp_t *s) { if (s->server_srv == NULL && s->server_srv_tls == NULL) { /* Failed to resolve anything: a fallback. */ const char *host = jid_bare_to_host(s->initial_jid); - int port = 5222; + uint16_t port = 5222; rexmpp_log(s, LOG_DEBUG, "Connecting to %s:%d", host, port); rexmpp_process_conn_err(s, rexmpp_tcp_conn_init(&s->server_connection, host, port)); diff --git a/src/rexmpp_tcp.c b/src/rexmpp_tcp.c index 777aa37..ff88121 100644 --- a/src/rexmpp_tcp.c +++ b/src/rexmpp_tcp.c @@ -93,7 +93,7 @@ rexmpp_tcp_connected (rexmpp_tcp_conn_t *conn, int fd) { rexmpp_tcp_conn_error_t rexmpp_tcp_conn_init (rexmpp_tcp_conn_t *conn, const char *host, - int port) + uint16_t port) { int i; for (i = 0; i < REXMPP_TCP_MAX_CONNECTION_ATTEMPTS; i++) { diff --git a/src/rexmpp_tcp.h b/src/rexmpp_tcp.h index 124da2a..e4a6dff 100644 --- a/src/rexmpp_tcp.h +++ b/src/rexmpp_tcp.h @@ -66,7 +66,7 @@ struct rexmpp_tcp_connection { /** @brief A host we are connecting to. */ const char *host; /** @brief A port we are connecting to. */ - int port; + uint16_t port; /** @brief Resolver channel. */ ares_channel resolver_channel; @@ -116,7 +116,7 @@ struct rexmpp_tcp_connection { rexmpp_tcp_conn_error_t rexmpp_tcp_conn_init (rexmpp_tcp_conn_t *conn, const char *host, - int port); + uint16_t port); /** @brief Continues a connection process. -- cgit v1.2.3