Commit bcf58042 authored by Danny Mayer's avatar Danny Mayer
Browse files

win32 keyboard routines

parent a0f85429
/*
* Copyright (C) 2000 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
* INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: keyboard.h,v 1.1 2001/07/06 05:51:43 mayer Exp $ */
#ifndef ISC_KEYBOARD_H
#define ISC_KEYBOARD_H 1
//#include <termios.h>
#include <isc/lang.h>
#include <isc/result.h>
ISC_LANG_BEGINDECLS
typedef struct {
int fd;
// struct termios saved_mode;
isc_result_t result;
} isc_keyboard_t;
isc_result_t
isc_keyboard_open(isc_keyboard_t *keyboard);
isc_result_t
isc_keyboard_close(isc_keyboard_t *keyboard, unsigned int sleepseconds);
isc_result_t
isc_keyboard_getchar(isc_keyboard_t *keyboard, unsigned char *cp);
isc_boolean_t
isc_keyboard_canceled(isc_keyboard_t *keyboard);
ISC_LANG_ENDDECLS
#endif /* ISC_KEYBOARD_H */
......@@ -15,17 +15,25 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: mutex.h,v 1.13 2001/01/09 21:59:03 bwelling Exp $ */
/* $Id: mutex.h,v 1.15 2001/07/08 05:09:28 mayer Exp $ */
#ifndef ISC_MUTEX_H
#define ISC_MUTEX_H 1
#include <isc/net.h>
#include <windows.h>
#include <isc/result.h>
typedef CRITICAL_SECTION isc_mutex_t;
/* This definition is here since WINBASE.H omits it for some reason */
WINBASEAPI BOOL WINAPI
TryEnterCriticalSection(
LPCRITICAL_SECTION lpCriticalSection
);
#define isc_mutex_init(mp) \
(InitializeCriticalSection((mp)), ISC_R_SUCCESS)
#define isc_mutex_lock(mp) \
......@@ -37,4 +45,9 @@ typedef CRITICAL_SECTION isc_mutex_t;
#define isc_mutex_destroy(mp) \
(DeleteCriticalSection((mp)), ISC_R_SUCCESS)
/*
* This is a placeholder for now since we are not keeping any mutex stats
*/
#define isc_mutex_stats(fp)
#endif /* ISC_MUTEX_H */
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: net.h,v 1.12 2001/01/09 21:59:04 bwelling Exp $ */
/* $Id: net.h,v 1.13 2001/07/06 05:51:44 mayer Exp $ */
#ifndef ISC_NET_H
#define ISC_NET_H 1
......@@ -32,9 +32,11 @@
*
* struct in_addr
* struct in6_addr
* struct in6_pktinfo
* struct sockaddr
* struct sockaddr_in
* struct sockaddr_in6
* in_port_t
*
* It ensures that the AF_ and PF_ macros are defined.
*
......@@ -45,6 +47,9 @@
* It ensures that INADDR_ANY, IN6ADDR_ANY_INIT, in6addr_any, and
* in6addr_loopback are available.
*
* It ensures that IN_MULTICAST() is available to check for multicast
* addresses.
*
* MP:
* No impact.
*
......@@ -63,76 +68,144 @@
*/
/***
*** Defines.
*** Imports.
***/
#include <isc/platform.h>
/*
* If this system has the IPv6 structure definitions, ISC_NET_HAVEIPV6
* will be defined.
* Because of some sort of problem in the MS header files, this cannot
* be simple "#include <winsock2.h>", because winsock2.h tries to include
* windows.h, which then generates an error out of mswsock.h. _You_
* figure it out.
*/
#undef ISC_NET_HAVEIPV6
#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
#endif
/*
* If this system needs inet_ntop(), ISC_NET_NEEDNTOP will be defined.
* Make the number of available sockets large
* The number of sockets needed can get large and memory's cheap
* This must be defined before winsock2.h gets included as the
* macro is used there.
*/
#define ISC_NET_NEEDNTOP 1
/*
* If this system needs inet_pton(), ISC_NET_NEEDPTON will be defined.
*/
#define ISC_NET_NEEDPTON 1
//#define FD_SETSIZE 16384
#include <winsock2.h>
#include <sys/types.h>
#include <isc/lang.h>
#include <isc/types.h>
#include <ws2tcpip.h>
#include <isc/ipv6.h>
/*
* If this system needs inet_aton(), ISC_NET_NEEDATON will be defined.
* This is here because named client, interfacemgr.c, etc. use the name as
* a variable
*/
#define ISC_NET_NEEDATON 1
#undef interface
/*
* If this system needs in_port_t, ISC_NET_NEEDPORTT will be defined.
* Ensure type in_port_t is defined.
*/
#define ISC_NET_NEEDPORTT 1
/***
*** Imports.
***/
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0400 /* Ensures windows.h includes winsock2.h. */
#ifdef ISC_PLATFORM_NEEDPORTT
typedef isc_uint16_t in_port_t;
#endif
/*
* Because of some sort of problem in the MS header files, this cannot
* be simple "#include <winsock2.h>", because winsock2.h tries to include
* windows.h, which then generates an error out of mswsock.h. _You_
* figure it out.
* If this system does not have MSG_TRUNC (as returned from recvmsg())
* ISC_PLATFORM_RECVOVERFLOW will be defined. This will enable the MSG_TRUNC
* faking code in socket.c.
*/
#include <windows.h>
#include <sys/types.h>
#ifndef MSG_TRUNC
#define ISC_PLATFORM_RECVOVERFLOW
#endif
#include <isc/lang.h>
#include <isc/result.h>
#define ISC__IPADDR(x) ((isc_uint32_t)htonl((isc_uint32_t)(x)))
#ifndef AF_INET6
#define AF_INET6 99
#endif
#define ISC_IPADDR_ISMULTICAST(i) \
(((isc_uint32_t)(i) & ISC__IPADDR(0xf0000000)) \
== ISC__IPADDR(0xe0000000))
#ifndef PF_INET6
#define PF_INET6 AF_INET6
#endif
/*
* Fix the FD_SET and FD_CLR Macros to properly cast
*/
#undef FD_CLR
#define FD_CLR(fd, set) do { \
u_int __i; \
for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count ; __i++) { \
if (((fd_set FAR *)(set))->fd_array[__i] == (SOCKET) fd) { \
while (__i < ((fd_set FAR *)(set))->fd_count-1) { \
((fd_set FAR *)(set))->fd_array[__i] = \
((fd_set FAR *)(set))->fd_array[__i+1]; \
__i++; \
} \
((fd_set FAR *)(set))->fd_count--; \
break; \
} \
} \
} while(0)
#ifndef ISC_NET_HAVEIPV6
#include <isc/ipv6.h>
#endif
#undef FD_SET
#define FD_SET(fd, set) do { \
u_int __i; \
for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count; __i++) { \
if (((fd_set FAR *)(set))->fd_array[__i] == (SOCKET)(fd)) { \
break; \
} \
} \
if (__i == ((fd_set FAR *)(set))->fd_count) { \
if (((fd_set FAR *)(set))->fd_count < FD_SETSIZE) { \
((fd_set FAR *)(set))->fd_array[__i] = (SOCKET)(fd); \
((fd_set FAR *)(set))->fd_count++; \
} \
} \
} while(0)
/*
* Ensure type in_port_t is defined.
* Windows Sockets errors redefined as regular Berkeley error constants.
* These are usually commented out in Windows NT to avoid conflicts with errno.h.
* Use the WSA constants instead.
*/
#ifdef ISC_NET_NEEDPORTT
#include <isc/int.h>
typedef isc_uint16_t in_port_t;
#endif
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EINPROGRESS WSAEINPROGRESS
#define EALREADY WSAEALREADY
#define ENOTSOCK WSAENOTSOCK
#define EDESTADDRREQ WSAEDESTADDRREQ
#define EMSGSIZE WSAEMSGSIZE
#define EPROTOTYPE WSAEPROTOTYPE
#define ENOPROTOOPT WSAENOPROTOOPT
#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
#define EOPNOTSUPP WSAEOPNOTSUPP
#define EPFNOSUPPORT WSAEPFNOSUPPORT
#define EAFNOSUPPORT WSAEAFNOSUPPORT
#define EADDRINUSE WSAEADDRINUSE
#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
#define ENETDOWN WSAENETDOWN
#define ENETUNREACH WSAENETUNREACH
#define ENETRESET WSAENETRESET
#define ECONNABORTED WSAECONNABORTED
#define ECONNRESET WSAECONNRESET
#define ENOBUFS WSAENOBUFS
#define EISCONN WSAEISCONN
#define ENOTCONN WSAENOTCONN
#define ESHUTDOWN WSAESHUTDOWN
#define ETOOMANYREFS WSAETOOMANYREFS
#define ETIMEDOUT WSAETIMEDOUT
#define ECONNREFUSED WSAECONNREFUSED
#define ELOOP WSAELOOP
//#define ENAMETOOLONG WSAENAMETOOLONG
#define EHOSTDOWN WSAEHOSTDOWN
#define EHOSTUNREACH WSAEHOSTUNREACH
//#define ENOTEMPTY WSAENOTEMPTY
#define EPROCLIM WSAEPROCLIM
#define EUSERS WSAEUSERS
#define EDQUOT WSAEDQUOT
#define ESTALE WSAESTALE
#define EREMOTE WSAEREMOTE
/***
*** Functions.
......@@ -164,18 +237,21 @@ isc_net_probeipv6(void);
* ISC_R_UNEXPECTED
*/
#ifdef ISC_NET_NEEDNTOP
const char *isc_net_ntop(int af, const void *src, char *dst, size_t size);
#ifdef ISC_PLATFORM_NEEDNTOP
const char *
isc_net_ntop(int af, const void *src, char *dst, size_t size);
#define inet_ntop isc_net_ntop
#endif
#ifdef ISC_NET_NEEDPTON
int isc_net_pton(int af, const char *src, void *dst);
#ifdef ISC_PLATFORM_NEEDPTON
int
isc_net_pton(int af, const char *src, void *dst);
#define inet_pton isc_net_pton
#endif
#ifdef ISC_NET_NEEDATON
int isc_net_aton(const char *cp, struct in_addr *addr);
#ifdef ISC_PLATFORM_NEEDATON
int
isc_net_aton(const char *cp, struct in_addr *addr);
#define inet_aton isc_net_aton
#endif
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: thread.h,v 1.13 2001/01/09 21:59:08 bwelling Exp $ */
/* $Id: thread.h,v 1.14 2001/07/06 05:51:45 mayer Exp $ */
#ifndef ISC_THREAD_H
#define ISC_THREAD_H 1
......@@ -25,6 +25,45 @@
#include <isc/lang.h>
#include <isc/result.h>
/*
* Inlines to help with wait retrun checking
*/
// check handle for NULL and INVALID_HANDLE
inline BOOL IsValidHandle( HANDLE hHandle) {
return ((hHandle != NULL) && (hHandle != INVALID_HANDLE_VALUE));
}
// validate wait return codes...
inline BOOL WaitSucceeded( DWORD dwWaitResult, DWORD dwHandleCount) {
return ((dwWaitResult >= WAIT_OBJECT_0) &&
(dwWaitResult < WAIT_OBJECT_0 + dwHandleCount));
}
inline BOOL WaitAbandoned( DWORD dwWaitResult, DWORD dwHandleCount) {
return ((dwWaitResult >= WAIT_ABANDONED_0) &&
(dwWaitResult < WAIT_ABANDONED_0 + dwHandleCount));
}
inline BOOL WaitTimeout( DWORD dwWaitResult) {
return (dwWaitResult == WAIT_TIMEOUT);
}
inline BOOL WaitFailed( DWORD dwWaitResult) {
return (dwWaitResult == WAIT_FAILED);
}
// compute object indices for waits...
inline DWORD WaitSucceededIndex( DWORD dwWaitResult) {
return (dwWaitResult - WAIT_OBJECT_0);
}
inline DWORD WaitAbandonedIndex( DWORD dwWaitResult) {
return (dwWaitResult - WAIT_ABANDONED_0);
}
typedef HANDLE isc_thread_t;
typedef unsigned int isc_threadresult_t;
typedef void * isc_threadarg_t;
......@@ -40,6 +79,9 @@ isc_thread_create(isc_threadfunc_t, isc_threadarg_t, isc_thread_t *);
isc_result_t
isc_thread_join(isc_thread_t, isc_threadresult_t *);
void
isc_thread_setconcurrency(unsigned int level);
ISC_LANG_ENDDECLS
#endif /* ISC_THREAD_H */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment