[11/13] Installed-header hygiene (BZ#20366): struct osockaddr.
Commit Message
sys/socket.h defines struct osockaddr only under __USE_MISC, whereas
protocols/talkd.h requires it unconditionally. This is another place
where the bits/types/foo.h approach comes in handy.
I would also be amenable to removing struct osockaddr from sys/socket.h,
defining it only in protocols/talkd.h, on the theory that nothing else
should be using it anymore. (Frankly, I doubt anyone would miss
protocols/talkd.h at this point, but we _have_ historically preferred
not to delete anything.)
* socket/bits/types/struct_osockaddr.h: New header.
* include/bits/types/struct_osockaddr.h: New wrapper.
* socket/Makefile: Install the new header.
* socket/sys/socket.h
* inet/protocols/talkd.h: Refer to bits/types/struct_osockaddr.h
for the definition of struct osockaddr.
---
include/bits/types/struct_osockaddr.h | 1 +
inet/protocols/talkd.h | 1 +
socket/Makefile | 3 ++-
socket/bits/types/struct_osockaddr.h | 12 ++++++++++++
socket/sys/socket.h | 8 +-------
5 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 include/bits/types/struct_osockaddr.h
create mode 100644 socket/bits/types/struct_osockaddr.h
Comments
On 08/29/2016 09:16 PM, Zack Weinberg wrote:
> sys/socket.h defines struct osockaddr only under __USE_MISC, whereas
> protocols/talkd.h requires it unconditionally. This is another place
> where the bits/types/foo.h approach comes in handy.
>
> I would also be amenable to removing struct osockaddr from sys/socket.h,
> defining it only in protocols/talkd.h, on the theory that nothing else
> should be using it anymore. (Frankly, I doubt anyone would miss
> protocols/talkd.h at this point, but we _have_ historically preferred
> not to delete anything.)
Without a strong reason for deleting it we should keep it :-)
> * socket/bits/types/struct_osockaddr.h: New header.
> * include/bits/types/struct_osockaddr.h: New wrapper.
> * socket/Makefile: Install the new header.
> * socket/sys/socket.h
> * inet/protocols/talkd.h: Refer to bits/types/struct_osockaddr.h
> for the definition of struct osockaddr.
LGTM.
new file mode 100644
@@ -0,0 +1 @@
+#include "../../socket/bits/types/struct_osockaddr.h"
@@ -53,6 +53,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <stdint.h>
+#include <bits/types/struct_osockaddr.h>
/*
* Client->server request message format.
@@ -23,7 +23,8 @@ subdir := socket
include ../Makeconfig
headers := sys/socket.h sys/un.h bits/sockaddr.h bits/socket.h \
- bits/socket2.h sys/socketvar.h net/if.h
+ bits/socket2.h bits/types/struct_osockaddr.h \
+ sys/socketvar.h net/if.h
routines := accept bind connect getpeername getsockname getsockopt \
listen recv recvfrom recvmsg send sendmsg sendto \
new file mode 100644
@@ -0,0 +1,12 @@
+#ifndef _BITS_TYPES_STRUCT_OSOCKADDR_H
+#define _BITS_TYPES_STRUCT_OSOCKADDR_H
+
+/* This is the 4.3 BSD `struct sockaddr' format, which is used as wire
+ format in the grotty old 4.3 `talk' protocol. */
+struct osockaddr
+{
+ unsigned short int sa_family;
+ unsigned char sa_data[14];
+};
+
+#endif
@@ -38,13 +38,7 @@ __BEGIN_DECLS
#include <bits/socket.h>
#ifdef __USE_MISC
-/* This is the 4.3 BSD `struct sockaddr' format, which is used as wire
- format in the grotty old 4.3 `talk' protocol. */
-struct osockaddr
- {
- unsigned short int sa_family;
- unsigned char sa_data[14];
- };
+# include <bits/types/struct_osockaddr.h>
#endif
/* The following constants should be used for the second parameter of