1 From 4b7f3716b8678c9ff423445f41e6ffb47fd295cd Mon Sep 17 00:00:00 2001
2 From: Mike Frysinger <vapier@gentoo.org>
3 Date: Sat, 26 Jan 2013 17:40:24 -0500
4 Subject: [PATCH] libc/sysdeps: sync bits/in.h with glibc
6 URL: https://bugs.busybox.net/show_bug.cgi?id=5888
7 Signed-off-by: Mike Frysinger <vapier@gentoo.org>
9 libc/sysdeps/linux/common/bits/in.h | 61 +++++++++++++++++++++++------------
10 1 file changed, 41 insertions(+), 20 deletions(-)
12 diff --git a/libc/sysdeps/linux/common/bits/in.h b/libc/sysdeps/linux/common/bits/in.h
13 index 1f2b817..d9c5e2b 100644
14 --- a/libc/sysdeps/linux/common/bits/in.h
15 +++ b/libc/sysdeps/linux/common/bits/in.h
17 -/* Copyright (C) 1991-1999, 2000, 2004 Free Software Foundation, Inc.
18 +/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
19 This file is part of the GNU C Library.
21 The GNU C Library is free software; you can redistribute it and/or
23 #define IP_ADD_SOURCE_MEMBERSHIP 39 /* ip_mreq_source: join source group */
24 #define IP_DROP_SOURCE_MEMBERSHIP 40 /* ip_mreq_source: leave source group */
25 #define IP_MSFILTER 41
26 -#define MCAST_JOIN_GROUP 42 /* group_req: join any-source group */
27 -#define MCAST_BLOCK_SOURCE 43 /* group_source_req: block from given group */
28 -#define MCAST_UNBLOCK_SOURCE 44 /* group_source_req: unblock from given group*/
29 -#define MCAST_LEAVE_GROUP 45 /* group_req: leave any-source group */
30 -#define MCAST_JOIN_SOURCE_GROUP 46 /* group_source_req: join source-spec gr */
31 -#define MCAST_LEAVE_SOURCE_GROUP 47 /* group_source_req: leave source-spec gr*/
32 -#define MCAST_MSFILTER 48
34 -#define MCAST_EXCLUDE 0
35 -#define MCAST_INCLUDE 1
37 -#define IP_ROUTER_ALERT 5 /* bool */
38 -#define IP_PKTINFO 8 /* bool */
39 -#define IP_PKTOPTIONS 9
40 -#define IP_PMTUDISC 10 /* obsolete name? */
41 -#define IP_MTU_DISCOVER 10 /* int; see below */
42 -#define IP_RECVERR 11 /* bool */
43 -#define IP_RECVTTL 12 /* bool */
44 -#define IP_RECVTOS 13 /* bool */
45 +#if defined __USE_MISC || defined __USE_GNU
46 +# define MCAST_JOIN_GROUP 42 /* group_req: join any-source group */
47 +# define MCAST_BLOCK_SOURCE 43 /* group_source_req: block from given group */
48 +# define MCAST_UNBLOCK_SOURCE 44 /* group_source_req: unblock from given group*/
49 +# define MCAST_LEAVE_GROUP 45 /* group_req: leave any-source group */
50 +# define MCAST_JOIN_SOURCE_GROUP 46 /* group_source_req: join source-spec gr */
51 +# define MCAST_LEAVE_SOURCE_GROUP 47 /* group_source_req: leave source-spec gr*/
52 +# define MCAST_MSFILTER 48
53 +# define IP_MULTICAST_ALL 49
54 +# define IP_UNICAST_IF 50
56 +# define MCAST_EXCLUDE 0
57 +# define MCAST_INCLUDE 1
60 +#define IP_ROUTER_ALERT 5 /* bool */
61 +#define IP_PKTINFO 8 /* bool */
62 +#define IP_PKTOPTIONS 9
63 +#define IP_PMTUDISC 10 /* obsolete name? */
64 +#define IP_MTU_DISCOVER 10 /* int; see below */
65 +#define IP_RECVERR 11 /* bool */
66 +#define IP_RECVTTL 12 /* bool */
67 +#define IP_RECVTOS 13 /* bool */
68 +#define IP_MTU 14 /* int */
69 +#define IP_FREEBIND 15
70 +#define IP_IPSEC_POLICY 16
71 +#define IP_XFRM_POLICY 17
72 +#define IP_PASSSEC 18
73 +#define IP_TRANSPARENT 19
74 +#define IP_MULTICAST_ALL 49 /* bool */
76 +/* TProxy original addresses */
77 +#define IP_ORIGDSTADDR 20
78 +#define IP_RECVORIGDSTADDR IP_ORIGDSTADDR
83 /* IP_MTU_DISCOVER arguments. */
84 #define IP_PMTUDISC_DONT 0 /* Never send DF frames. */
85 #define IP_PMTUDISC_WANT 1 /* Use per route hints. */
86 #define IP_PMTUDISC_DO 2 /* Always DF. */
87 +#define IP_PMTUDISC_PROBE 3 /* Ignore dst pmtu. */
89 /* To select the IP level. */
92 #define IP_DEFAULT_MULTICAST_LOOP 1
93 #define IP_MAX_MEMBERSHIPS 20
95 +#if defined __USE_MISC || defined __USE_GNU
96 /* Structure used to describe IP options for IP_OPTIONS and IP_RETOPTS.
97 The `ip_dst' field is used for the first-hop gateway when using a
98 source route (this gets put into the header proper). */
99 @@ -100,6 +119,7 @@ struct in_pktinfo
100 struct in_addr ipi_spec_dst; /* Routing destination address */
101 struct in_addr ipi_addr; /* Header destination address */
105 #ifdef __UCLIBC_HAS_IPV6__
106 /* Options for use with `getsockopt' and `setsockopt' at the IPv6 level.
107 @@ -159,6 +179,7 @@ struct in_pktinfo
108 #define IPV6_PMTUDISC_DONT 0 /* Never send DF frames. */
109 #define IPV6_PMTUDISC_WANT 1 /* Use per route hints. */
110 #define IPV6_PMTUDISC_DO 2 /* Always DF. */
111 +#define IPV6_PMTUDISC_PROBE 3 /* Ignore dst pmtu. */
113 /* Socket level values for IPv6. */