diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2019-01-18 21:30:06 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2019-01-18 21:30:06 +0000 |
| commit | e4478d7e46876142b5f75cfc93ef649a6bde05ae (patch) | |
| tree | 7a6cf3249776d0c53db59202ed08ff9d6f4a2ef4 /include/protocols | |
| parent | 03d9c6aa55b57d3d35756da1d2784fa3e5fabc7b (diff) | |
Notes
Diffstat (limited to 'include/protocols')
| -rw-r--r-- | include/protocols/talkd.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h index f8b74b9c6981..dc79bef77b6e 100644 --- a/include/protocols/talkd.h +++ b/include/protocols/talkd.h @@ -55,6 +55,15 @@ */ /* + * 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. */ typedef struct { @@ -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 */ |