summaryrefslogtreecommitdiff
path: root/include/protocols
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2005-09-24 16:40:01 +0000
committerchristos <christos@NetBSD.org>2005-09-24 16:40:01 +0000
commitc4445bc71c50f4c65b27a45c3458f3dfff2a055d (patch)
treec8024c05877b2f92273cf148c3c7f87e8be65a03 /include/protocols
parent86497ecc9fc0e3d6c0174ee1bacb3f52308ac2fb (diff)
rename osockaddr to talkd_sockaddr and use that instead.
Diffstat (limited to 'include/protocols')
-rw-r--r--include/protocols/talkd.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h
index 4f44974536b..ead3de5d55a 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: talkd.h,v 1.8 2003/08/07 09:44:13 agc Exp $ */
+/* $NetBSD: talkd.h,v 1.9 2005/09/24 16:40:01 christos Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -53,6 +53,14 @@
*/
/*
+ * 4.3 compat sockaddr
+ */
+struct talkd_sockaddr {
+ u_int16_t sa_family; /* address family */
+ char sa_data[14]; /* up to 14 bytes of direct address */
+};
+
+/*
* Client->server request message format.
*/
typedef struct {
@@ -61,8 +69,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 talkd_sockaddr addr; /* old (4.3) style */
+ struct talkd_sockaddr 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 */
@@ -80,7 +88,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 talkd_sockaddr addr; /* address for establishing conversation */
} CTL_RESPONSE;
#define TALK_VERSION 1 /* protocol version */