Use a private definition of osockaddr rather then relying on type

namespace polution in sys/socket.h.

Also remove support for operation on 4.3BSD.

PR:		224529
Differential Revision:	https://reviews.freebsd.org/D14505
This commit is contained in:
Brooks Davis
2019-01-18 21:30:06 +00:00
parent 03d9c6aa55
commit e4478d7e46
4 changed files with 16 additions and 14 deletions
+12 -3
View File
@@ -54,6 +54,15 @@
* stream connection through which the conversation takes place.
*/
/*
* The talk protocol embeds a 4.3BSD sockaddr. Define our own version
* rather then relying on namespace polution in kernel headers.
*/
struct tsockaddr {
unsigned short sa_family;
char sa_data[14];
};
/*
* Client->server request message format.
*/
@@ -63,8 +72,8 @@ typedef struct {
u_char answer; /* not used */
u_char pad;
u_int32_t id_num; /* message id */
struct osockaddr addr; /* old (4.3) style */
struct osockaddr ctl_addr; /* old (4.3) style */
struct tsockaddr addr; /* old (4.3) style */
struct tsockaddr ctl_addr; /* old (4.3) style */
int32_t pid; /* caller's process id */
#define NAME_SIZE 12
char l_name[NAME_SIZE];/* caller's name */
@@ -82,7 +91,7 @@ typedef struct {
u_char answer; /* respose to request message, see below */
u_char pad;
u_int32_t id_num; /* message id */
struct osockaddr addr; /* address for establishing conversation */
struct tsockaddr addr; /* address for establishing conversation */
} CTL_RESPONSE;
#define TALK_VERSION 1 /* protocol version */