* Makefile.in (KRB5_HEADERS, install): Account for file renames.

(all-mac):  Add.
* configure.in (CONFIG_RULES):  Remove.
(krb5_sigtype):  Define as either void or int.
* encryption.h:  Insert parentheses in macros to avoid mis-expansion.
* k5-config.h:  Further parameterize socket support.
* macsock.h:  Support connect(), recv(), send(), getmyipaddr().
(WSAGetLastError):  Fix typo -- there's no argument to this macro.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5292 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 25 insertions, 11 deletions

diff --git a/src/include/krb5/macsock.h b/src/include/krb5/macsock.h
index 5c5ee976d..dc0d6619f 100644
--- a/src/include/krb5/macsock.h
+++ b/src/include/krb5/macsock.h
@@ -29,16 +29,6 @@
 #define PROTOTYPE(p) p
 #endif
 
-/* The socket data structure itself.   */
-struct socket {
-	short		fMacTCPRef;		/* refnum of MacTCP driver */
-	unsigned long	fStream;		/* MacTCP socket/stream */
-#	define		UDPbuflen	4096
-	char		fRecvBuf[UDPbuflen];	/* receive buffer area */
-};
-
-typedef struct socket *SOCKET;
-
 #define	WORD	short
 #define	LOBYTE(x)	 ((x)       & 0xFF)
 #define	HIBYTE(x)	(((x) >> 8) & 0xFF)
@@ -86,6 +76,19 @@ struct sockaddr_in {
 
 /* Socket address, other styles */
 #define	sockaddr sockaddr_in
+#define	sa_family sin_family
+
+
+/* The socket data structure itself.   */
+struct socket {
+	short		fMacTCPRef;		/* refnum of MacTCP driver */
+	unsigned long	fStream;		/* MacTCP socket/stream */
+	struct sockaddr_in connect_addr;	/* Address from connect call */
+#	define		UDPbuflen	4096
+	char		fRecvBuf[UDPbuflen];	/* receive buffer area */
+};
+
+typedef struct socket *SOCKET;
 
 /*
  * Host name<->address mapping entries
@@ -155,6 +158,10 @@ extern int
 sendto PROTOTYPE ((SOCKET theUDP, const char *buf, const int len, int flags,
 	const struct sockaddr *to, int tolen));
 
+/* Send a packet to a connected UDP peer.  */
+extern int
+send PROTOTYPE ((SOCKET theUDP, const char *buf, const int len, int flags));
+
 /* Select for sockets that are ready for I/O.
    This version just remembers the timeout for a future receive...
    It always reports that one socket is ready for I/O.  */
@@ -167,6 +174,10 @@ extern int
 recvfrom PROTOTYPE ((SOCKET theUDP, char *buf, int len, int flags,
 		     struct sockaddr *from, int *fromlen));
 
+/* Receive a packet from a connected UDP peer.  */
+extern int
+recv PROTOTYPE ((SOCKET theUDP, char *buf, int len, int flags));
+
 extern char *
 inet_ntoa PROTOTYPE ((struct in_addr ina));
 
@@ -176,6 +187,9 @@ gethostbyname PROTOTYPE ((char *));
 extern struct hostent *
 gethostbyaddr PROTOTYPE ((char *addr, int len, int type));
 
+extern struct hostent *
+getmyipaddr PROTOTYPE ((void));
+
 /* Bypass a few other functions we don't really need. */
 
 #define	getservbyname(name,prot)	0
@@ -191,7 +205,7 @@ gethostbyaddr PROTOTYPE ((char *addr, int len, int type));
  */
 #define	INVALID_SOCKET	((SOCKET)~0)
 #define	SOCKET_ERROR	(-1)
-#define	WSAGetLastError(x)	(errno)
+#define	WSAGetLastError()	(errno)
 #define	WSASetLastError(x)	(errno = (x))
 
 extern int errno;