@@ -303,7 +303,7 @@ frame_calculate_mssfix(struct frame *frame, struct key_type *kt,
/* Calculate the number of bytes that the payload differs from the payload
* MTU. This are fragment/compression/ethernet headers */
- payload_overhead = frame_calculate_payload_overhead(frame, options, kt, true);
+ payload_overhead = frame_calculate_payload_overhead(frame->extra_tun, options, kt);
/* We are in a "liberal" position with respect to MSS,
* i.e. we assume that MSS can be calculated from MTU
@@ -108,20 +108,16 @@ frame_calculate_protocol_header_size(const struct key_type *kt,
size_t
-frame_calculate_payload_overhead(const struct frame *frame,
+frame_calculate_payload_overhead(size_t extra_tun,
const struct options *options,
- const struct key_type *kt,
- bool extra_tun)
+ const struct key_type *kt)
{
size_t overhead = 0;
/* This is the overhead of tap device that is not included in the MTU itself
* i.e. Ethernet header that we still need to transmit as part of the
- * payload */
- if (extra_tun)
- {
- overhead += frame->extra_tun;
- }
+ * payload, this is set to 0 by caller if not applicable */
+ overhead += extra_tun;
#if defined(USE_COMP)
/* v1 Compression schemes add 1 byte header. V2 only adds a header when it
@@ -158,7 +154,7 @@ frame_calculate_payload_size(const struct frame *frame,
const struct key_type *kt)
{
size_t payload_size = options->ce.tun_mtu;
- payload_size += frame_calculate_payload_overhead(frame, options, kt, true);
+ payload_size += frame_calculate_payload_overhead(frame->extra_tun, options, kt);
return payload_size;
}
@@ -217,10 +217,10 @@ frame_calculate_payload_size(const struct frame *frame,
* * [IP][UDP][OPENVPN PROTOCOL HEADER][ **PAYLOAD incl compression header** ]
*/
size_t
-frame_calculate_payload_overhead(const struct frame *frame,
+frame_calculate_payload_overhead(size_t extra_tun,
const struct options *options,
- const struct key_type *kt,
- bool extra_tun);
+ const struct key_type *kt);
+
/**
* Calculates the size of the OpenVPN protocol header. This includes
@@ -305,8 +305,7 @@ check_send_occ_msg_dowork(struct context *c)
const struct key_type *kt = &c->c1.ks.key_type;
/* OCC message have comp/fragment headers but not ethernet headers */
- payload_hdr = frame_calculate_payload_overhead(&c->c2.frame, &c->options,
- kt, false);
+ payload_hdr = frame_calculate_payload_overhead(0, &c->options, kt);
/* Since we do not know the payload size we just pass 0 as size here */
proto_hdr = frame_calculate_protocol_header_size(kt, &c->options, false);
Instead of passing a value and a bool just pass the value and 0 if the caller does not want the value to be added. This also allows the function to be used by a function without a frame struct. Signed-off-by: Arne Schwabe <arne@rfc2549.org> --- src/openvpn/mss.c | 2 +- src/openvpn/mtu.c | 14 +++++--------- src/openvpn/mtu.h | 6 +++--- src/openvpn/occ.c | 3 +-- 4 files changed, 10 insertions(+), 15 deletions(-)