Skip to contentSkip to conversation

make sure sa_family_t is defined

PATCH In review Heiko Hund 3 participants 6 messages Jan 17, 2014

lore
Share & tools
lore

Heiko Hund

author
#0 lore raw

PATCH 1/1 make sure sa_family_t is defined

On Windows there's no sa_family_t. This patch defines it in syshead.h is configure did not find it in the system headers.

Signed-off-by Heiko Hund <[email protected]...>
---
 configure.ac          |    6 ++++++
 src/openvpn/syshead.h |    7 +++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
configure.ac +6 -0
index 636d4e2..65dbc25 100644
@@ -501,6 +501,12 @@ AC_CHECK_TYPE(
 	[[${SOCKET_INCLUDES}]]
 )
 AC_CHECK_TYPE(
+        [sa_family_t],
+        [AC_DEFINE([HAVE_SA_FAMILY_T], [1], [struct in_pktinfo needed for IP_PKTINFO support])],
+        ,
+        [[${SOCKET_INCLUDES}]]
+)
+AC_CHECK_TYPE(
 	[struct sockaddr_in6],
 	,
 	[AC_MSG_ERROR([struct sockaddr_in6 not found, needed for ipv6 transport support.])],
src/openvpn/syshead.h +7 -0
index ab6fa01..4050d54 100644
@@ -426,6 +426,13 @@
 #endif
 
 /*
+ * Define type sa_family_t if it isn't defined in the socket headers
+ */
+#ifndef HAVE_SA_FAMILY_T
+typedef unsigned short sa_family_t;
+#endif
+
+/*
  * Disable ESEC
  */
 #if 0
Signature · 1 line
1.7.9
author
#1 lore raw

PATCH 1/1 convert struct signal_info element

This one place was forgotten when the elements type was changed from bool to int in the dual stack patch 23d61c56.

Signed-off-by Heiko Hund <[email protected]...>
---
 src/openvpn/win32.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
src/openvpn/win32.c +1 -1
index f35c96b..7c89a5a 100644
@@ -517,7 +517,7 @@ win32_signal_get (struct win32_signal *ws)
       if (ret)
 	{
 	  siginfo_static.signal_received = ret;
-	  siginfo_static.hard = true;
+	  siginfo_static.source = SIG_SOURCE_HARD;
 	}
     }
   return ret;
Signature · 1 line
1.7.9
#2 lore raw

Re: [Openvpn-devel] [PATCH] convert struct signal_info element

Am 17.01.14 16:30, schrieb Heiko Hund:

Quoted 3 lines

This one place was forgotten when the elements type was changed from bool to int in the dual stack patch 23d61c56.

ACK

Arne

#3 lore raw

[Openvpn-devel] [PATCH applied] Re: convert struct signal_info element

In reply to Heiko Hund

Your patch has been applied to the master branch.

commit 9853b14f0934f6e37600b186831fae3d5bad213f

Author: Heiko Hund
Date:   Fri Jan 17 16:30:38 2014 +0100
     convert struct signal_info element

     Signed-off-by: Heiko Hund <[email protected]...>
     Acked-by: Arne Schwabe <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/8243
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#4 lore raw
In reply to Heiko Hund

Am 17.01.14 16:30, schrieb Heiko Hund:

Quoted 2 lines

On Windows there's no sa_family_t. This patch defines it in syshead.h is configure did not find it in the system headers.

ACK.

Arne

#5 lore raw
In reply to Heiko Hund

Your patch has been applied to the master branch.

I took the liberty to change the descriptive comment to something actually related to sa_family_t :-)

commit 87b468d42811f0ca6f046b3a0335811370193514

Author: Heiko Hund
Date:   Fri Jan 17 16:30:37 2014 +0100
     make sure sa_family_t is defined

     Signed-off-by: Heiko Hund <[email protected]...>
     Acked-by: Arne Schwabe <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/8242
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering