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/+/1475?usp=email
to review the following change.
Change subject: socket: Avoid conversion warning in get_addr_generic
......................................................................
socket: Avoid conversion warning in get_addr_generic
We already check earlier that bits is smaller that
max_bits, so the cast is safe.
While reviewing the callers, remove some unused
variables.
Change-Id: I5ad13bc6674b3403251cc552d1f2c0f057431817
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/options.c
M src/openvpn/socket.c
2 files changed, 11 insertions(+), 14 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/75/1475/1
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index cede758..85669e0 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -1144,10 +1144,7 @@
static bool
ipv6_addr_safe_hexplusbits(const char *ipv6_prefix_spec)
{
- struct in6_addr t_addr;
- unsigned int t_bits;
-
- return get_ipv6_addr(ipv6_prefix_spec, &t_addr, &t_bits, M_WARN);
+ return get_ipv6_addr(ipv6_prefix_spec, NULL, NULL, M_WARN);
}
static char *
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 093f822..331249d 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -72,11 +72,6 @@
}
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
/*
* Functions related to the translation of DNS names to IP addresses.
*/
@@ -180,7 +175,7 @@
if (netbits)
{
- *netbits = bits;
+ *netbits = (unsigned int)bits;
}
/* restore '/' separator, if any */
@@ -683,6 +678,11 @@
}
}
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+#endif
+
static void
create_socket(struct link_socket *sock, struct addrinfo *addr)
{
@@ -738,6 +738,10 @@
bind_local(sock, addr->ai_family);
}
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
#ifdef TARGET_ANDROID
static void
protect_fd_nonlocal(int fd, const struct sockaddr *addr)
@@ -861,10 +865,6 @@
gc_free(&gc);
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
static socket_descriptor_t
socket_listen_accept(socket_descriptor_t sd, struct link_socket_actual *act,
const struct addrinfo *local, bool do_listen,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1475?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: I5ad13bc6674b3403251cc552d1f2c0f057431817
Gerrit-Change-Number: 1475
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
