From 2525bc3915e7c5f5465503aa8811ea1b5473552e Mon Sep 17 00:00:00 2001 From: Jaeyun Date: Wed, 5 Oct 2022 15:00:43 +0900 Subject: [PATCH] [Util] macro to check port number Add macro to check port number. Signed-off-by: Jaeyun --- src/libnnstreamer-edge/nnstreamer-edge-internal.c | 2 +- src/libnnstreamer-edge/nnstreamer-edge-util.c | 2 +- src/libnnstreamer-edge/nnstreamer-edge-util.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libnnstreamer-edge/nnstreamer-edge-internal.c b/src/libnnstreamer-edge/nnstreamer-edge-internal.c index 970b9b2..7cb9ea3 100644 --- a/src/libnnstreamer-edge/nnstreamer-edge-internal.c +++ b/src/libnnstreamer-edge/nnstreamer-edge-internal.c @@ -1497,7 +1497,7 @@ nns_edge_connect (nns_edge_h edge_h, const char *dest_host, int dest_port) return NNS_EDGE_ERROR_INVALID_PARAMETER; } - if (dest_port <= 0 || dest_port > 65535) { + if (!PORT_IS_VALID (dest_port)) { nns_edge_loge ("Invalid port number %d.", dest_port); return NNS_EDGE_ERROR_INVALID_PARAMETER; } diff --git a/src/libnnstreamer-edge/nnstreamer-edge-util.c b/src/libnnstreamer-edge/nnstreamer-edge-util.c index 7e137be..4157afe 100644 --- a/src/libnnstreamer-edge/nnstreamer-edge-util.c +++ b/src/libnnstreamer-edge/nnstreamer-edge-util.c @@ -100,7 +100,7 @@ nns_edge_parse_port_number (const char *port_str) port = (int) strtoll (port_str, NULL, 10); - if (port <= 0 || port > 65535) { + if (!PORT_IS_VALID (port)) { nns_edge_loge ("Invalid port number %d.", port); port = -1; } diff --git a/src/libnnstreamer-edge/nnstreamer-edge-util.h b/src/libnnstreamer-edge/nnstreamer-edge-util.h index b009b63..dae98bd 100644 --- a/src/libnnstreamer-edge/nnstreamer-edge-util.h +++ b/src/libnnstreamer-edge/nnstreamer-edge-util.h @@ -41,6 +41,7 @@ extern "C" { #endif #define STR_IS_VALID(s) ((s) && (s)[0] != '\0') +#define PORT_IS_VALID(p) ((p) > 0 && (p) <= 65535) #define SAFE_FREE(p) do { if (p) { free (p); (p) = NULL; } } while (0) #define NNS_EDGE_MAGIC 0xfeedfeed -- 2.34.1