Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1131?usp=email
to look at the new patch set (#6).
Change subject: socket: Change resolve flags to unsigned int
......................................................................
socket: Change resolve flags to unsigned int
And use them consistently so to avoid conversion
warnings.
Change-Id: I5ef21e425786a49c90d4b7305c3fb174ab6ddf92
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/socket.c
M src/openvpn/socket.h
M src/openvpn/socket_util.h
3 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/31/1131/6
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 306170c..e362e5e 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -245,10 +245,10 @@
*/
static int
get_cached_dns_entry(struct cached_dns_entry *dns_cache, const char *hostname,
const char *servname,
- int ai_family, int resolve_flags, struct addrinfo **ai)
+ int ai_family, unsigned int resolve_flags, struct
addrinfo **ai)
{
struct cached_dns_entry *ph;
- int flags;
+ unsigned int flags;
/* Only use flags that are relevant for the structure */
flags = resolve_flags & GETADDR_CACHE_MASK;
@@ -268,7 +268,7 @@
static int
do_preresolve_host(struct context *c, const char *hostname, const char
*servname, const int af,
- const int flags)
+ const unsigned int flags)
{
struct addrinfo *ai;
int status;
@@ -322,7 +322,7 @@
{
int status;
const char *remote;
- int flags = preresolve_flags;
+ unsigned int flags = preresolve_flags;
struct connection_entry *ce = l->array[i];
@@ -1185,7 +1185,7 @@
/* resolve local address if undefined */
if (!sock->info.lsa->bind_local)
{
- int flags = GETADDR_RESOLVE | GETADDR_WARN_ON_SIGNAL | GETADDR_FATAL |
GETADDR_PASSIVE;
+ unsigned int flags = GETADDR_RESOLVE | GETADDR_WARN_ON_SIGNAL |
GETADDR_FATAL | GETADDR_PASSIVE;
int status;
if (proto_is_dgram(sock->info.proto))
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h
index cce9183..e45981f 100644
--- a/src/openvpn/socket.h
+++ b/src/openvpn/socket.h
@@ -67,7 +67,7 @@
const char *hostname;
const char *servname;
int ai_family;
- int flags;
+ unsigned int flags;
struct addrinfo *ai;
struct cached_dns_entry *next;
};
diff --git a/src/openvpn/socket_util.h b/src/openvpn/socket_util.h
index 5ea37dd..801fbfa 100644
--- a/src/openvpn/socket_util.h
+++ b/src/openvpn/socket_util.h
@@ -114,18 +114,18 @@
* DNS resolution
*/
-#define GETADDR_RESOLVE (1 << 0)
-#define GETADDR_FATAL (1 << 1)
-#define GETADDR_HOST_ORDER (1 << 2)
-#define GETADDR_MENTION_RESOLVE_RETRY (1 << 3)
-#define GETADDR_FATAL_ON_SIGNAL (1 << 4)
-#define GETADDR_WARN_ON_SIGNAL (1 << 5)
-#define GETADDR_MSG_VIRT_OUT (1 << 6)
-#define GETADDR_TRY_ONCE (1 << 7)
-#define GETADDR_UPDATE_MANAGEMENT_STATE (1 << 8)
-#define GETADDR_RANDOMIZE (1 << 9)
-#define GETADDR_PASSIVE (1 << 10)
-#define GETADDR_DATAGRAM (1 << 11)
+#define GETADDR_RESOLVE (1u << 0)
+#define GETADDR_FATAL (1u << 1)
+#define GETADDR_HOST_ORDER (1u << 2)
+#define GETADDR_MENTION_RESOLVE_RETRY (1u << 3)
+#define GETADDR_FATAL_ON_SIGNAL (1u << 4)
+#define GETADDR_WARN_ON_SIGNAL (1u << 5)
+#define GETADDR_MSG_VIRT_OUT (1u << 6)
+#define GETADDR_TRY_ONCE (1u << 7)
+#define GETADDR_UPDATE_MANAGEMENT_STATE (1u << 8)
+#define GETADDR_RANDOMIZE (1u << 9)
+#define GETADDR_PASSIVE (1u << 10)
+#define GETADDR_DATAGRAM (1u << 11)
#define GETADDR_CACHE_MASK (GETADDR_DATAGRAM | GETADDR_PASSIVE)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1131?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I5ef21e425786a49c90d4b7305c3fb174ab6ddf92
Gerrit-Change-Number: 1131
Gerrit-PatchSet: 6
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
