projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yet another WIN32 fix for connect notify.
[yazpp-moved-to-github.git]
/
src
/
yaz-socket-manager.cpp
diff --git
a/src/yaz-socket-manager.cpp
b/src/yaz-socket-manager.cpp
index
376a079
..
a64b9bc
100644
(file)
--- a/
src/yaz-socket-manager.cpp
+++ b/
src/yaz-socket-manager.cpp
@@
-3,7
+3,13
@@
* See the file LICENSE for details.
*
* $Log: yaz-socket-manager.cpp,v $
* See the file LICENSE for details.
*
* $Log: yaz-socket-manager.cpp,v $
- * Revision 1.12 2000-10-24 12:29:57 adam
+ * Revision 1.14 2000-11-20 14:17:36 adam
+ * Yet another WIN32 fix for connect notify.
+ *
+ * Revision 1.13 2000/11/20 11:27:33 adam
+ * Fixes for connect operation (timeout and notify fix).
+ *
+ * Revision 1.12 2000/10/24 12:29:57 adam
* Fixed bug in proxy where a Yaz_ProxyClient could be owned by
* two Yaz_Proxy's (fatal).
*
* Fixed bug in proxy where a Yaz_ProxyClient could be owned by
* two Yaz_Proxy's (fatal).
*
@@
-161,11
+167,20
@@
int Yaz_SocketManager::processEvent()
if (p->mask)
no++;
if (p->mask & YAZ_SOCKET_OBSERVE_READ)
if (p->mask)
no++;
if (p->mask & YAZ_SOCKET_OBSERVE_READ)
+ {
+ yaz_log (m_log, "select fd=%d: read fd", fd);
FD_SET(fd, &in);
FD_SET(fd, &in);
+ }
if (p->mask & YAZ_SOCKET_OBSERVE_WRITE)
if (p->mask & YAZ_SOCKET_OBSERVE_WRITE)
+ {
+ yaz_log (m_log, "select fd=%d: write fd", fd);
FD_SET(fd, &out);
FD_SET(fd, &out);
+ }
if (p->mask & YAZ_SOCKET_OBSERVE_EXCEPT)
if (p->mask & YAZ_SOCKET_OBSERVE_EXCEPT)
+ {
+ yaz_log (m_log, "select fd=%d: except fd", fd);
FD_SET(fd, &except);
FD_SET(fd, &except);
+ }
if (fd > max)
max = fd;
if (p->timeout)
if (fd > max)
max = fd;
if (p->timeout)
@@
-174,6
+189,8
@@
int Yaz_SocketManager::processEvent()
timeout_this = p->timeout;
if (p->last_activity)
timeout_this -= now - p->last_activity;
timeout_this = p->timeout;
if (p->last_activity)
timeout_this -= now - p->last_activity;
+ else
+ p->last_activity = now;
if (timeout_this < 1)
timeout_this = 1;
if (!timeout || timeout_this < timeout)
if (timeout_this < 1)
timeout_this = 1;
if (!timeout || timeout_this < timeout)
@@
-222,7
+239,7
@@
int Yaz_SocketManager::processEvent()
now >= p->last_activity + (int) (p->timeout))
{
YazSocketEvent *event = new YazSocketEvent;
now >= p->last_activity + (int) (p->timeout))
{
YazSocketEvent *event = new YazSocketEvent;
- logf (LOG_LOG, "timeout now = %ld last_activity=%ld timeout=%d",
+ logf (m_log, "timeout, now = %ld last_activity=%ld timeout=%d",
now, p->last_activity, p->timeout);
p->last_activity = now;
event->observer = p->observer;
now, p->last_activity, p->timeout);
p->last_activity = now;
event->observer = p->observer;