2004-04-22 Ralf Corsepius <ralf_corsepius@rtems.org>

* libnetworking/sys/socket.h: Further update from FreeBSD
	(Add sa_family_t).
This commit is contained in:
Ralf Corsepius
2004-04-22 04:31:34 +00:00
parent 8bbe9ea012
commit 105dcfcd3b
2 changed files with 12 additions and 6 deletions

View File

@@ -1,3 +1,8 @@
2004-04-22 Ralf Corsepius <ralf_corsepius@rtems.org>
* libnetworking/sys/socket.h: Further update from FreeBSD
(Add sa_family_t).
2004-04-22 Ralf Corsepius <ralf_corsepius@rtems.org> 2004-04-22 Ralf Corsepius <ralf_corsepius@rtems.org>
* libnetworking/sys/protosw.h: Partial update from FreeBSD. * libnetworking/sys/protosw.h: Partial update from FreeBSD.

View File

@@ -42,6 +42,7 @@
#if defined(__rtems__) #if defined(__rtems__)
/* RTEMS doesn't have FreeBSD's sys/_types.h machinery. */ /* RTEMS doesn't have FreeBSD's sys/_types.h machinery. */
typedef int socklen_t; typedef int socklen_t;
typedef unsigned char sa_family_t;
#endif #endif
/* /*
@@ -157,7 +158,7 @@ struct sockwakeup {
*/ */
struct sockaddr { struct sockaddr {
unsigned char sa_len; /* total length */ unsigned char sa_len; /* total length */
u_char sa_family; /* address family */ sa_family_t sa_family; /* address family */
char sa_data[14]; /* actually longer; address value */ char sa_data[14]; /* actually longer; address value */
}; };
@@ -278,12 +279,12 @@ struct sockproto {
* Used value-result for recvmsg, value only for sendmsg. * Used value-result for recvmsg, value only for sendmsg.
*/ */
struct msghdr { struct msghdr {
void *msg_name; /* optional address */ void *msg_name; /* optional address */
u_int msg_namelen; /* size of address */ socklen_t msg_namelen; /* size of address */
struct iovec *msg_iov; /* scatter/gather array */ struct iovec *msg_iov; /* scatter/gather array */
int msg_iovlen; /* # elements in msg_iov */ int msg_iovlen; /* # elements in msg_iov */
void *msg_control; /* ancillary data, see below */ void *msg_control; /* ancillary data, see below */
u_int msg_controllen; /* ancillary data buffer len */ socklen_t msg_controllen; /* ancillary data buffer len */
int msg_flags; /* flags on received message */ int msg_flags; /* flags on received message */
}; };
@@ -305,7 +306,7 @@ struct msghdr {
* of message elements headed by cmsghdr structures. * of message elements headed by cmsghdr structures.
*/ */
struct cmsghdr { struct cmsghdr {
u_int cmsg_len; /* data byte count, including hdr */ socklen_t cmsg_len; /* data byte count, including hdr */
int cmsg_level; /* originating protocol */ int cmsg_level; /* originating protocol */
int cmsg_type; /* protocol-specific type */ int cmsg_type; /* protocol-specific type */
/* followed by u_char cmsg_data[]; */ /* followed by u_char cmsg_data[]; */