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/+/1472?usp=email
to review the following change.
Change subject: forward: Avoid conversion warning in ipv6_send_icmp_unreachable
......................................................................
forward: Avoid conversion warning in ipv6_send_icmp_unreachable
Since all values are limited by MAX_ICMPV6LEN we can
just cast to uint16_t.
While here remove a unused gc arena in neighbouring
code.
Change-Id: I701f9e0a96a7b43f278f8e6089e9156feab772c8
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/forward.c
1 file changed, 5 insertions(+), 16 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/72/1472/1
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index d208c21..3730cd5 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -1352,11 +1352,6 @@
check_status(c->c2.buf.len, "read from TUN/TAP", NULL, c->c1.tuntap);
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
/**
* Drops UDP packets which OS decided to route via tun.
*
@@ -1483,8 +1478,6 @@
void
process_incoming_tun(struct context *c, struct link_socket *out_sock)
{
- struct gc_arena gc = gc_new();
-
if (c->c2.buf.len > 0)
{
c->c2.tun_read_bytes += c->c2.buf.len;
@@ -1528,7 +1521,6 @@
{
buf_reset(&c->c2.to_link);
}
- gc_free(&gc);
}
/**
@@ -1593,7 +1585,7 @@
icmp6out.icmp6_type = OPENVPN_ICMP6_DESTINATION_UNREACHABLE;
icmp6out.icmp6_code = OPENVPN_ICMP6_DU_NOROUTE;
- int icmpheader_len = sizeof(struct openvpn_ipv6hdr) + sizeof(struct
openvpn_icmp6hdr);
+ const int icmpheader_len = sizeof(struct openvpn_ipv6hdr) + sizeof(struct
openvpn_icmp6hdr);
int totalheader_len = icmpheader_len;
if (TUNNEL_TYPE(c->c1.tuntap) == DEV_TYPE_TAP)
@@ -1606,10 +1598,11 @@
* frame should be <= 1280 and have as much as possible of the original
* packet
*/
- int max_payload_size = min_int(MAX_ICMPV6LEN, c->c2.frame.tun_mtu -
icmpheader_len);
- int payload_len = min_int(max_payload_size, BLEN(&inputipbuf));
+ const int max_payload_size = min_int(MAX_ICMPV6LEN, c->c2.frame.tun_mtu -
icmpheader_len);
+ const int payload_len = min_int(max_payload_size, BLEN(&inputipbuf));
+ const uint16_t icmp_len = (uint16_t)(sizeof(struct openvpn_icmp6hdr) +
payload_len);
- pip6out.payload_len = htons(sizeof(struct openvpn_icmp6hdr) + payload_len);
+ pip6out.payload_len = htons(icmp_len);
/* Construct the packet as outgoing packet back to the client */
struct buffer *outbuf;
@@ -1665,10 +1658,6 @@
#undef MAX_ICMPV6LEN
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
void
process_ip_header(struct context *c, unsigned int flags, struct buffer *buf,
struct link_socket *sock)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1472?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: I701f9e0a96a7b43f278f8e6089e9156feab772c8
Gerrit-Change-Number: 1472
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
