summaryrefslogtreecommitdiff
path: root/Ivy/Ivy.cxx
diff options
context:
space:
mode:
authorfcolin2009-10-08 13:07:04 +0000
committerfcolin2009-10-08 13:07:04 +0000
commit00e97f3decde46e85fba871a20aa79e27cb679e3 (patch)
tree31084ff19777b8cbe36b1eeb9d979370a33f79d7 /Ivy/Ivy.cxx
parent773d105e88a4323b844b378e599e2884310eaa50 (diff)
downloadivy-cplusplus-00e97f3decde46e85fba871a20aa79e27cb679e3.zip
ivy-cplusplus-00e97f3decde46e85fba871a20aa79e27cb679e3.tar.gz
ivy-cplusplus-00e97f3decde46e85fba871a20aa79e27cb679e3.tar.bz2
ivy-cplusplus-00e97f3decde46e85fba871a20aa79e27cb679e3.tar.xz
correction des bug connexion concurrente
correction sur le ready message attente des deux endRegexp
Diffstat (limited to 'Ivy/Ivy.cxx')
-rw-r--r--Ivy/Ivy.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/Ivy/Ivy.cxx b/Ivy/Ivy.cxx
index 16b76b1..fa1021d 100644
--- a/Ivy/Ivy.cxx
+++ b/Ivy/Ivy.cxx
@@ -284,7 +284,7 @@ void Ivy::SendSubscriptions(IvyApplication *app)
app->SendMsg( IvyApplication::AddRegexp, id, regexp.c_str());
}
app->SendMsg( IvyApplication::EndRegexp, 0);
-
+ app->SendReadyToPeer();
}
@@ -406,19 +406,19 @@ void Ivy::SetFilter(int argc, const char **argv )
IvyBinding::SetFilter(argc, argv );
}
-bool Ivy::CheckConnected(IvyApplication * app)
+IvyApplication * Ivy::CheckConnected(IvyApplication * app)
{
if (app->remoteService == 0) /* old application dont check */
- return false;
+ return 0;
/* check to see if app already connected */
IvyApplicationList::iterator iter;
for ( iter = applications.begin() ; iter != applications.end() ; ++iter )
{
IvyApplication *application = *iter;
if ( application != app && application->SameApplication(app))
- return true;
+ return application;
}
- return false;
+ return 0;
}
void Ivy::SubstituteInterval (const char *src, char *dst, size_t dst_len)
{