Add a few defines to <netinet/udp.h>.

diff --git a/ChangeLog b/ChangeLog
index fb2c8eb..5fd0861 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-10-30  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #10315]
+       * sysdeps/gnu/netinet/udp.h: Define UDP_CORK, UDP_ENCAP,
+       UDP_ENCAP_ESPINUDP_NON_IKE, UDP_ENCAP_ESPINUDP, and
+       UDP_ENCAP_L2TPINUDP.
+
        [BZ #10349]
        * sysdeps/posix/tempname.c (__gen_tempname): Take new second
        parameter, specifying length of prefix.

diff --git a/sysdeps/gnu/netinet/udp.h b/sysdeps/gnu/netinet/udp.h
index 45b69f7..ae1beb9 100644 (file)
--- a/sysdeps/gnu/netinet/udp.h
+++ b/sysdeps/gnu/netinet/udp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 95, 96, 97, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,1995-1997,2004,2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -74,6 +74,16 @@ struct udphdr
 };
 #endif
 
+/* UDP socket options */
+#define UDP_CORK       1       /* Never send partially complete segments.  */
+#define UDP_ENCAP      100     /* Set the socket to accept
+                                  encapsulated packets.  */
+
+/* UDP encapsulation types */
+#define UDP_ENCAP_ESPINUDP_NON_IKE 1   /* draft-ietf-ipsec-nat-t-ike-00/01 */
+#define UDP_ENCAP_ESPINUDP     2       /* draft-ietf-ipsec-udp-encaps-06 */
+#define UDP_ENCAP_L2TPINUDP    3       /* rfc2661 */
+
 #define SOL_UDP            17      /* sockopt level for UDP */
 
 #endif /* netinet/udp.h */