Libc-1439.100.3.tar.gz

[apple/libc.git] / include / protocols / talkd.h

diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h
index 154760b1d5135cdaf39302a3ab35e7554dddd579..bd375abe4a4fb69cf2534288634332bbe49d0faf 100644 (file)
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.h
@@ -1,10 +1,8 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2006, 2007 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -78,35 +76,56 @@
  * stream connection through which the conversation takes place.
  */
 
+/*
+ * 4.3 compat sockaddr
+ */
+#include <_types.h>
+struct osockaddr {
+       __uint16_t      sa_family;      /* address family */
+       char            sa_data[14];    /* up to 14 bytes of direct address */
+};
+
 /*
  * Client->server request message format.
  */
 typedef struct {
-       u_char  vers;           /* protocol version */
-       u_char  type;           /* request type, see below */
-       u_char  answer;         /* not used */
-       u_char  pad;
-       u_long  id_num;         /* message id */
-       struct  osockaddr addr;         /* old (4.3) style */
-       struct  osockaddr ctl_addr;     /* old (4.3) style */
-       long    pid;            /* caller's process id */
+       unsigned char   vers;           /* protocol version */
+       unsigned char   type;           /* request type, see below */
+       unsigned char   answer;         /* not used */
+       unsigned char   pad;
+#ifdef __LP64__
+       unsigned int    id_num;         /* message id */
+#else /* !__LP64__ */
+       unsigned long   id_num;         /* message id */
+#endif /* __LP64__ */
+       struct          osockaddr addr;         /* old (4.3) style */
+       struct          osockaddr ctl_addr;     /* old (4.3) style */
+#ifdef __LP64__
+       int             pid;            /* caller's process id */
+#else /* !__LP64__ */
+       long            pid;            /* caller's process id */
+#endif /* __LP64__ */
 #define        NAME_SIZE       12
-       char    l_name[NAME_SIZE];/* caller's name */
-       char    r_name[NAME_SIZE];/* callee's name */
+       char            l_name[NAME_SIZE];/* caller's name */
+       char            r_name[NAME_SIZE];/* callee's name */
 #define        TTY_SIZE        16
-       char    r_tty[TTY_SIZE];/* callee's tty name */
+       char            r_tty[TTY_SIZE];/* callee's tty name */
 } CTL_MSG;
 
 /*
  * Server->client response message format.
  */
 typedef struct {
-       u_char  vers;           /* protocol version */
-       u_char  type;           /* type of request message, see below */
-       u_char  answer;         /* respose to request message, see below */
-       u_char  pad;
-       u_long  id_num;         /* message id */
-       struct  osockaddr addr; /* address for establishing conversation */
+       unsigned char   vers;           /* protocol version */
+       unsigned char   type;           /* type of request message, see below */
+       unsigned char   answer;         /* respose to request message, see below */
+       unsigned char   pad;
+#ifdef __LP64__
+       unsigned int    id_num;         /* message id */
+#else /* !__LP64__ */
+       unsigned long   id_num;         /* message id */
+#endif /* __LP64__ */
+       struct  osockaddr addr;         /* address for establishing conversation */
 } CTL_RESPONSE;
 
 #define        TALK_VERSION    1               /* protocol version */