#include <timely/time_control.h>
#include <timely/time_stamp.h>
-#ifdef __UNIX__
+//hmmm: put this bag o headers into a similar thing to windoze helper. maybe just have an os_helper file that combines both?
+//#ifdef __UNIX__
#include <arpa/inet.h>
#include <errno.h>
#include <netdb.h>
#include <sys/types.h>
#include <termios.h>
#include <unistd.h>
-#endif
+//#endif
using namespace basis;
using namespace loggers;
#define CHECK_BOGUS(retval) \
if (is_bogus()) { return retval; /* this spocket is junk. */ }
+/*
#undef GRAB_LOCK
#ifdef __WIN32__
// win32 seems to trip over selects unless we protect them.
#else
#define GRAB_LOCK
#endif
+*/
+ #define GRAB_LOCK
-#ifdef __UNIX__
+
+//#ifdef __UNIX__
SAFE_STATIC(mutex, __broken_pipe_synch, )
-#endif
+//#endif
spocket::spocket(const internet_address &where, sock_types type)
: _type(type),
//moving to always re-resolving before a connect. otherwise we have somewhat
//hard to predict behavior about when the re-resolve will happen.
) {
- // we know we need to resolve if the address is NIL or if the re-resolve
+ // we know we need to resolve if the address is NULL_POINTER or if the re-resolve
// interval has elapsed.
astring full_host;
byte_array ip_addr = _stack->full_resolve(_where->hostname, full_host);
// we don't lock in here; we should not be locking on the server socket.
- sock = NIL; // reset.
+ sock = NULL_POINTER; // reset.
if (_socket) {
#ifdef DEBUG_SPOCKET