Merge release/3.11.4 to master

dsommers · dsommers · commit 960845ea3e5c · 2025-08-27T13:49:00.000+02:00
The change to openvpn/dco/ovpn_dco_linux.h has been ignored, since git
master contains a different implementation which uses the upstream
kernel ovpn module from the 6.16 kernel release.

Signed-off-by: David Sommerseth &lt;dazo@eurephia.org&gt;
diff --git a/openvpn/aws/awsroute.hpp b/openvpn/aws/awsroute.hpp
@@ -424,7 +424,7 @@ class Route
                           "replace_create_route: unknown RouteTargetType " << (int)target_type);
         }
 
-        const std::string dest_cidr_block_name = ipv6 ? "DestinationCidrIpv6Block" : "DestinationCidrBlock";
+        const std::string dest_cidr_block_name = ipv6 ? "DestinationIpv6CidrBlock" : "DestinationCidrBlock";
 
         // create API query
         {

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ class Route`
`424`	`424`	`"replace_create_route: unknown RouteTargetType " << (int)target_type);`
`425`	`425`	`}`
`426`	`426`
`427`		`- const std::string dest_cidr_block_name = ipv6 ? "DestinationCidrIpv6Block" : "DestinationCidrBlock";`
	`427`	`+ const std::string dest_cidr_block_name = ipv6 ? "DestinationIpv6CidrBlock" : "DestinationCidrBlock";`
`428`	`428`
`429`	`429`	`// create API query`
`430`	`430`	`{`