bits/in.h patch

bits/in.h patch

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 2001 bytes --]


The following patch fixes bugzilla #3905 and adds some more options.

Looking at the Linux header linux/in6.h I see also the following changes:
#define IPV6_2292PKTINFO	2
#define IPV6_2292HOPOPTS	3
#define IPV6_2292DSTOPTS	4
#define IPV6_2292RTHDR		5
#define IPV6_2292PKTOPTIONS	6
#define IPV6_2292HOPLIMIT	8

#define IPV6_RECVPKTINFO	49
#define IPV6_PKTINFO		50
#define IPV6_RECVHOPLIMIT	51
#define IPV6_HOPLIMIT		52
#define IPV6_RECVHOPOPTS	53
#define IPV6_HOPOPTS		54
#define IPV6_RTHDRDSTOPTS	55
#define IPV6_RECVRTHDR		56
#define IPV6_RTHDR		57
#define IPV6_RECVDSTOPTS	58
#define IPV6_DSTOPTS		59

These redefine some values.  Should I add these as well?  That would
close bugzilla #3906 as well.

Ok to submit the appended patch?

Andreas

2007-02-18  Andreas Jaeger  <aj@suse.de>

	[BZ #3905]
	* bits/in.h (IPV6_ROUTER_ALERT, IPV6_MTU_DISCOVER, IPV6_MTU,
	IPV6_RECVERR, IPV6_V6ONLY, IPV6_JOIN_ANYCAST, IPV6_LEAVE_ANYCAST):
	Added.

--- bits/in.h   10 Aug 2004 22:05:17 -0000      1.8
+++ bits/in.h   18 Feb 2007 13:45:36 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2000, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2000, 2004, 2007 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
@@ -68,6 +68,13 @@ struct ip_opts
 #define IPV6_MULTICAST_LOOP    19
 #define IPV6_JOIN_GROUP                20
 #define IPV6_LEAVE_GROUP       21
+#define IPV6_ROUTER_ALERT      22
+#define IPV6_MTU_DISCOVER      23
+#define IPV6_MTU               24
+#define IPV6_RECVERR           25
+#define IPV6_V6ONLY            26
+#define IPV6_JOIN_ANYCAST      27
+#define IPV6_LEAVE_ANYCAST     28

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj/
  SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
   Maxfeldstr. 5, 90409 Nürnberg, Germany
    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: bits/in.h patch

[Ulrich Drepper]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

Andreas Jaeger wrote:
> These redefine some values.  Should I add these as well?  That would
> close bugzilla #3906 as well.

How do you know the values Hurd is using?  The value for all these
macros is system-specific.

-- 
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 251 bytes --]

Re: bits/in.h patch

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

Ulrich Drepper <drepper@redhat.com> writes:

> Andreas Jaeger wrote:
>> These redefine some values.  Should I add these as well?  That would
>> close bugzilla #3906 as well.
>
> How do you know the values Hurd is using?  The value for all these
> macros is system-specific.

Shouldn't we make then the file completely system dependend and move
it to sysdeps?

Andreas
-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj/
  SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
   Maxfeldstr. 5, 90409 Nürnberg, Germany
    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: bits/in.h patch

[Ulrich Drepper]

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

Andreas Jaeger wrote:
> Shouldn't we make then the file completely system dependend and move
> it to sysdeps?

And create a dummy file just to complicate things?  I see no reason to
disturb the status quo.

-- 
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 251 bytes --]

Re: bits/in.h patch

[Roland McGrath]

The Hurd does not have working ipv6 support yet, and when it does it will
be fine to have it use the Linux numbers for socket options in the user API
(it will probably be using the Linux ipv6 code anyway).  

Re: bits/in.h patch

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

Roland McGrath <roland@redhat.com> writes:

> The Hurd does not have working ipv6 support yet, and when it does it will
> be fine to have it use the Linux numbers for socket options in the user API
> (it will probably be using the Linux ipv6 code anyway).  

So, should my patch go in?  Or how should we solve this?


Andreas
-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj/
  SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
   Maxfeldstr. 5, 90409 Nürnberg, Germany
    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: bits/in.h patch

[Roland McGrath]

> Roland McGrath <roland@redhat.com> writes:
> 
> > The Hurd does not have working ipv6 support yet, and when it does it will
> > be fine to have it use the Linux numbers for socket options in the user API
> > (it will probably be using the Linux ipv6 code anyway).  
> 
> So, should my patch go in?  Or how should we solve this?

I think it's fine.

Re: bits/in.h patch

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 714 bytes --]

Roland McGrath <roland@redhat.com> writes:

>> Roland McGrath <roland@redhat.com> writes:
>> 
>> > The Hurd does not have working ipv6 support yet, and when it does it will
>> > be fine to have it use the Linux numbers for socket options in the user API
>> > (it will probably be using the Linux ipv6 code anyway).  
>> 
>> So, should my patch go in?  Or how should we solve this?
>
> I think it's fine.

Ok, submitted now, - and closed the PR,

Andreas
-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj/
  SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
   Maxfeldstr. 5, 90409 Nürnberg, Germany
    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]