This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
Remove ip_options
- To: libc-alpha Mailinglist <libc-alpha at sourceware dot cygnus dot com>
- Subject: Remove ip_options
- From: Andreas Jaeger <aj at suse dot de>
- Date: 25 Jul 2000 12:16:15 +0200
- Cc: Andi Kleen <ak at suse dot de>
Andi Kleen asked me to remove ip_options - according to him the struct
is not part of the ABI, used only internally by the kernel and only
confuses users. setsockopt needs a real IP option, not ip_options.
A grep through glibc revealed that glibc itself doesn't use ip_options
anywhere, we only have the definition in a linux specific file.
Is the appended patch ok to commit for glibc 2.2?
Andreas
2000-07-25 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/netinet/ip.h: Removed ip_options since
it's not needed and confuses only.
============================================================
Index: sysdeps/unix/sysv/linux/netinet/ip.h
--- sysdeps/unix/sysv/linux/netinet/ip.h 1999/06/08 21:13:52 1.9
+++ sysdeps/unix/sysv/linux/netinet/ip.h 2000/07/25 10:13:29
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,95,96,97,98,99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,95,96,97,98,99,2000 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
@@ -40,29 +40,6 @@
# error "Please fix <bits/endian.h>"
#endif
u_int32_t data[9];
- };
-
-struct ip_options
- {
- u_int32_t faddr; /* Saved first hop address */
- u_int8_t optlen;
- u_int8_t srr;
- u_int8_t rr;
- u_int8_t ts;
- unsigned int is_setbyuser:1; /* Set by setsockopt? */
- unsigned int is_data:1; /* Options in __data, rather than skb */
- unsigned int is_strictroute:1; /* Strict source route */
- unsigned int srr_is_hit:1; /* Packet destination addr was our one */
- unsigned int is_changed:1; /* IP checksum more not valid */
- unsigned int rr_needaddr:1; /* Need to record addr of outgoing dev */
- unsigned int ts_needtime:1; /* Need to record timestamp */
- unsigned int ts_needaddr:1; /* Need to record addr of outgoing dev */
- u_int8_t router_alert;
- u_int8_t __pad1;
- u_int8_t __pad2;
-#ifdef __GNUC__
- u_int8_t __data[0];
-#endif
};
struct iphdr
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de