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
Debug package libyazpp5-dbg. YPP-6
[yazpp-moved-to-github.git]
/
zlint
/
zlint.cpp
diff --git
a/zlint/zlint.cpp
b/zlint/zlint.cpp
index
11e6ccd
..
88aa73f
100644
(file)
--- a/
zlint/zlint.cpp
+++ b/
zlint/zlint.cpp
@@
-1,5
+1,5
@@
/* This file is part of the yazpp toolkit.
/* This file is part of the yazpp toolkit.
- * Copyright (C) 1998-2012 Index Data and Mike Taylor
+ * Copyright (C) 1998-2013 Index Data and Mike Taylor
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-79,13
+79,12
@@
void Zlint::timeoutNotify()
{
if (m_cur_test->m_t->recv_fail(this, 2) != TEST_FINISHED)
{
{
if (m_cur_test->m_t->recv_fail(this, 2) != TEST_FINISHED)
{
- close();
client(m_host);
timeout(30);
return;
}
client(m_host);
timeout(30);
return;
}
+ close_goto_next();
}
}
- close_goto_next();
}
void Zlint::failNotify()
}
void Zlint::failNotify()
@@
-94,13
+93,12
@@
void Zlint::failNotify()
{
if (m_cur_test->m_t->recv_fail(this, 1) != TEST_FINISHED)
{
{
if (m_cur_test->m_t->recv_fail(this, 1) != TEST_FINISHED)
{
- close();
client(m_host);
timeout(30);
return;
}
client(m_host);
timeout(30);
return;
}
+ close_goto_next();
}
}
- close_goto_next();
}
void Zlint::connectNotify()
}
void Zlint::connectNotify()
@@
-109,8
+107,8
@@
void Zlint::connectNotify()
{
if (m_cur_test->m_t->init(this) != TEST_FINISHED)
return;
{
if (m_cur_test->m_t->init(this) != TEST_FINISHED)
return;
+ close_goto_next();
}
}
- close_goto_next();
}
void Zlint::recv_GDU(Z_GDU *gdu, int len)
}
void Zlint::recv_GDU(Z_GDU *gdu, int len)
@@
-122,23
+120,25
@@
void Zlint::recv_GDU(Z_GDU *gdu, int len)
return;
if (r == TEST_REOPEN)
{
return;
if (r == TEST_REOPEN)
{
- close();
client(m_host);
timeout(30);
return;
}
client(m_host);
timeout(30);
return;
}
+ close_goto_next();
}
}
- close_goto_next();
}
void Zlint::close_goto_next()
{
}
void Zlint::close_goto_next()
{
- close();
if (m_cur_test)
m_cur_test = m_cur_test->m_next;
if (m_cur_test)
if (m_cur_test)
m_cur_test = m_cur_test->m_next;
if (m_cur_test)
+ {
client(m_host);
client(m_host);
- timeout(30);
+ timeout(30);
+ }
+ else
+ close();
}
IPDU_Observer *Zlint::sessionNotify(
}
IPDU_Observer *Zlint::sessionNotify(
@@
-160,15
+160,12
@@
Z_ReferenceId *Zlint::mk_refid(const char *buf, int len)
int Zlint::initResponseGetVersion(Z_InitResponse *init)
{
int no = 0;
int Zlint::initResponseGetVersion(Z_InitResponse *init)
{
int no = 0;
- int off = 0;
int i;
for (i = 0; i<12; i++)
if (ODR_MASK_GET(init->protocolVersion, no))
{
no = i+1;
}
int i;
for (i = 0; i<12; i++)
if (ODR_MASK_GET(init->protocolVersion, no))
{
no = i+1;
}
- else
- off = 1;
return no;
}
return no;
}