diff mbox series

[Openvpn-devel,v1] dco-win: simplify control packets prepend code

Message ID 20250220074327.24922-1-gert@greenie.muc.de
State Accepted
Headers show
Series [Openvpn-devel,v1] dco-win: simplify control packets prepend code | expand

Commit Message

Gert Doering Feb. 20, 2025, 7:43 a.m. UTC 
From: Lev Stipakov <lev@openvpn.net>

Eliminate unneeded temporary struct sockaddr_in buffer.

Change-Id: Ie57f7b11157ab5ca8ff01e1c4f03a308117ff937
Signed-off-by: Lev Stipakov <lev@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/900
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>

Comments

Gert Doering Feb. 20, 2025, 8:04 a.m. UTC | #1 
Straightforward, so I have not actually tested the resulting openvpn.exe
- but stared very hard at the change & asked MinGW for an opinion (no
errors or warnings).

Fixed one whitespace gotcha on the fly.

Your patch has been applied to the master branch.

commit a8e67c7d0642f6b7e12ffc98af8495e66664d895
Author: Lev Stipakov
Date:   Thu Feb 20 08:43:27 2025 +0100

     dco-win: simplify control packets prepend code

     Signed-off-by: Lev Stipakov <lev@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20250220074327.24922-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg30942.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h
index c370f2c..ee04a96 100644
--- a/src/openvpn/socket.h
+++ b/src/openvpn/socket.h
@@ -1125,15 +1125,11 @@ 
     {
         if (to->dest.addr.sa.sa_family == AF_INET)
         {
-            struct sockaddr_in sa;
-            memcpy(&sa, &to->dest.addr.in4, sizeof(sa));
-            buf_write_prepend(buf, &sa, sizeof(sa));
+            buf_write_prepend(buf,  &to->dest.addr.in4, sizeof(struct sockaddr_in));
         }
         else
         {
-            struct sockaddr_in6 sa;
-            memcpy(&sa, &to->dest.addr.in6, sizeof(sa));
-            buf_write_prepend(buf, &sa, sizeof(sa));
+            buf_write_prepend(buf, &to->dest.addr.in6, sizeof(struct sockaddr_in6));
         }
     }