Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1310?usp=email
to review the following change.
Change subject: manage: Change kill_by_addr to use better types for port/proto
......................................................................
manage: Change kill_by_addr to use better types for port/proto
Change-Id: I750a0b8107baa77fb14558d0c8e4ef8020d62efd
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/multi.c
M src/openvpn/socket.h
4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/10/1310/1
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index 1cb5c63..823e46a 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -608,14 +608,14 @@
if (status)
{
const int port = atoi(p3);
- const int proto = (streq(p1, "tcp")) ? PROTO_TCP_SERVER
- : (streq(p1, "udp")) ? PROTO_UDP
- : PROTO_NONE;
+ const uint8_t proto = (streq(p1, "tcp")) ? PROTO_TCP_SERVER
+ : (streq(p1, "udp")) ? PROTO_UDP
+ : PROTO_NONE;
- if ((port > 0 && port < 65536) && (proto != PROTO_NONE))
+ if ((port > 0 && port < UINT16_MAX) && (proto != PROTO_NONE))
{
n_killed =
(*man->persist.callback.kill_by_addr)(man->persist.callback.arg,
- addr,
port, proto);
+ addr,
(uint16_t)port, proto);
if (n_killed > 0)
{
msg(M_CLIENT, "SUCCESS: %d client(s) at address
%s:%s:%d killed", n_killed,
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h
index a31eb06..1a14c9d 100644
--- a/src/openvpn/manage.h
+++ b/src/openvpn/manage.h
@@ -178,7 +178,7 @@
void (*status)(void *arg, const int version, struct status_output *so);
void (*show_net)(void *arg, const msglvl_t msglevel);
int (*kill_by_cn)(void *arg, const char *common_name);
- int (*kill_by_addr)(void *arg, const in_addr_t addr, const int port, const
int proto);
+ int (*kill_by_addr)(void *arg, const in_addr_t addr, const uint16_t port,
const uint8_t proto);
void (*delete_event)(void *arg, event_t event);
int (*n_clients)(void *arg);
bool (*send_cc_message)(void *arg, const char *message, const char
*parameter);
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index fa9c654..ad5004e 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -3952,7 +3952,7 @@
}
static int
-management_callback_kill_by_addr(void *arg, const in_addr_t addr, const int
port, const int proto)
+management_callback_kill_by_addr(void *arg, const in_addr_t addr, const
uint16_t port, const uint8_t proto)
{
struct multi_context *m = (struct multi_context *)arg;
struct hash_iterator hi;
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h
index e986c9c..832d62e 100644
--- a/src/openvpn/socket.h
+++ b/src/openvpn/socket.h
@@ -89,7 +89,7 @@
const char *ipchange_command;
const struct plugin_list *plugins;
bool remote_float;
- int proto; /* Protocol (PROTO_x defined below) */
+ uint8_t proto; /* Protocol (PROTO_x defined below) */
sa_family_t af; /* Address family like AF_INET, AF_INET6 or AF_UNSPEC*/
bool bind_ipv6_only;
int mtu_changed; /* Set to true when mtu value is changed */
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1310?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I750a0b8107baa77fb14558d0c8e4ef8020d62efd
Gerrit-Change-Number: 1310
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
