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
Fix attribute check
[yazpp-moved-to-github.git]
/
src
/
yaz-proxy.cpp
diff --git
a/src/yaz-proxy.cpp
b/src/yaz-proxy.cpp
index
1275732
..
0dc0669
100644
(file)
--- a/
src/yaz-proxy.cpp
+++ b/
src/yaz-proxy.cpp
@@
-2,7
+2,7
@@
* Copyright (c) 1998-2003, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 1998-2003, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-proxy.cpp,v 1.66 2003-10-23 09:10:12 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.70 2003-11-08 18:51:10 adam Exp $
*/
#include <assert.h>
*/
#include <assert.h>
@@
-72,7
+72,7
@@
Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
m_client_idletime = 600;
m_target_idletime = 600;
m_optimize = xstrdup ("1");
m_client_idletime = 600;
m_target_idletime = 600;
m_optimize = xstrdup ("1");
- strcpy(m_session_str, "0");
+ strcpy(m_session_str, "0 ");
m_session_no=0;
m_bytes_sent = m_bytes_recv = 0;
m_bw_hold_PDU = 0;
m_session_no=0;
m_bytes_sent = m_bytes_recv = 0;
m_bw_hold_PDU = 0;
@@
-895,7
+895,6
@@
void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu, int len)
if (cp)
sprintf(cp+1, "%d ", m_request_no);
if (cp)
sprintf(cp+1, "%d ", m_request_no);
- int reduce = 0;
m_bytes_recv += len;
if (m_log_mask & PROXY_LOG_APDU_CLIENT)
m_bytes_recv += len;
if (m_log_mask & PROXY_LOG_APDU_CLIENT)
@@
-913,6
+912,7
@@
void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu, int len)
yaz_log(LOG_LOG, "%sstat bw=%d pdu=%d limit-bw=%d limit-pdu=%d",
m_session_str, bw_total, pdu_total, m_bw_max, m_pdu_max);
yaz_log(LOG_LOG, "%sstat bw=%d pdu=%d limit-bw=%d limit-pdu=%d",
m_session_str, bw_total, pdu_total, m_bw_max, m_pdu_max);
+ int reduce = 0;
if (m_bw_max)
{
if (bw_total > m_bw_max)
if (m_bw_max)
{
if (bw_total > m_bw_max)
@@
-924,7
+924,7
@@
void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu, int len)
{
if (pdu_total > m_pdu_max)
{
{
if (pdu_total > m_pdu_max)
{
- int nreduce = (60/m_pdu_max);
+ int nreduce = (m_pdu_max >= 60) ? 1 : 60/m_pdu_max;
reduce = (reduce > nreduce) ? reduce : nreduce;
}
}
reduce = (reduce > nreduce) ? reduce : nreduce;
}
}
@@
-1340,8
+1340,8
@@
void Yaz_Proxy::pre_init()
other++;
}
}
other++;
}
}
- yaz_log(LOG_LOG, "%s pre-init %s %s use=%d other=%d spare=%d preinit=%d",
- m_session_str,
+ yaz_log(LOG_LOG, "%spre-init %s %s use=%d other=%d spare=%d "
+ "preinit=%d",m_session_str,
name, zurl_in_use[j], in_use, other, spare, pre_init);
if (spare < pre_init)
{
name, zurl_in_use[j], in_use, other, spare, pre_init);
if (spare < pre_init)
{
@@
-1529,10
+1529,14
@@
void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len)
}
}
}
}
-void Yaz_Proxy::server(const char *addr)
+int Yaz_Proxy::server(const char *addr)
{
{
- Yaz_Z_Assoc::server(addr);
-
- timeout(1);
+ int r = Yaz_Z_Assoc::server(addr);
+ if (!r)
+ {
+ yaz_log(LOG_LOG, "%sStarted listener on %s", m_session_str, addr);
+ timeout(1);
+ }
+ return r;
}
}