From 3a4b32280456fd880bbd2282171f7087a9137314 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:56:59 +0000 Subject: Utilisateur : Fcolin Date : 16/06/00 Heure : 10:14 Créé (vss 1) --- Ivy/Ivy.h | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 Ivy/Ivy.h (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h new file mode 100644 index 0000000..4fa1859 --- /dev/null +++ b/Ivy/Ivy.h @@ -0,0 +1,97 @@ +// Ivy.h: interface for the Ivy class. +// +////////////////////////////////////////////////////////////////////// + +#if !defined(AFX_BUS_H__F7F08FE9_E653_11D0_AE3E_080009F92591__INCLUDED_) +#define AFX_BUS_H__F7F08FE9_E653_11D0_AE3E_080009F92591__INCLUDED_ + +#if _MSC_VER >= 1000 +#pragma once +#endif // _MSC_VER >= 1000 +#ifdef WIN32 +#ifdef IVY_EXPORTS +class _declspec(dllexport) IvyWatcher; +class _declspec(dllexport) IvyApplication; +class _declspec(dllexport) Ivy; +#else +#pragma comment(lib,"Ivy.LIB" ) +class _declspec(dllimport) IvyWatcher; +class _declspec(dllimport) IvyApplication; +class _declspec(dllimport) Ivy; +#endif +#endif + +#include "stdafx.h" + +#include "IvyCallback.h" + +class IvyWatcher; + +class IvyApplication; + +class Ivy +{ +private: + + UINT applicationPort; + void SendSubscriptions(IvyApplication *app); + +public: + void AddApplication( IvyApplication *app ); + void RemoveApplication( IvyApplication *app); + + BOOL CheckConnected( IvyApplication *app ); + BOOL CheckRegexp( const char *exp ); + void CallApplicationConnectedCallback( IvyApplication *app ); + void CallApplicationDisconnectedCallback( IvyApplication *app ); + BOOL CallDieCallback( IvyApplication *app, int id, const char *arg ); + void CallDirectMessageCallback( IvyApplication *app, int id, const char *arg ); + void CallMessageCallback( IvyApplication *app, int id, int argc, const char **argv ); + + +public: + + void Classes( int argc, const char **argv ); + + void SendDirectMsg( IvyApplication *app, int id, const char *message); + void BindDirectMsg( IvyDirectMessageCallback *callback ); + int SendMsg( const char *message ); + + const char *GetDomain(const char *domainlist); + UINT GetApplicationPort(); + int BindMsg( const char *regexp, IvyMessageCallback *cb ); + void UnbindMsg( int id ); + Ivy( const char *name, const char* ready, IvyApplicationCallback *callback, bool Synchronous = true ); + void start(const char *domain); + void stop(); + virtual ~Ivy(); + + /* message a emettre sur connection nouvelle application */ + string ready_message; + +protected: + bool synchronous; // use Window Shink to made CB mono thread like + IvyApplication * server; + IvyWatcher * watcher; + IvyDieCallback *die_callback; + IvyDirectMessageCallback *direct_callback; + IvyApplicationCallback *application_callback; + /* list des adresses de broadcast */ + string domain; + /* nom de l'appliction */ + string appname; + /* liste des clients connectes */ + CRITICAL_SECTION m_application_cs; + std::vector applications; + + /* liste des souscriptions locale a emettre aux autres applications */ + std::vector regexp_out; + /* liste des callbacks a appeler */ + std::vector< IvyMessageCallback* > callbacks; + /* classes de messages emis par l'application utilise pour le filtrage */ + int messages_classes_count; + const char **messages_classes; + +}; + +#endif // !defined(AFX_BUS_H__F7F08FE9_E653_11D0_AE3E_080009F92591__INCLUDED_) -- cgit v1.1 From 38ea33b22d7de3fe79da5ee0b539f5eef251516f Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:01 +0000 Subject: Utilisateur : Fcolin Date : 20/07/00 Heure : 10:57 Archivé dans $/Ivy (vss 2) --- Ivy/Ivy.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 4fa1859..b0a175e 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -82,7 +82,8 @@ protected: string appname; /* liste des clients connectes */ CRITICAL_SECTION m_application_cs; - std::vector applications; + typedef std::list IvyApplicationList; + IvyApplicationList applications; /* liste des souscriptions locale a emettre aux autres applications */ std::vector regexp_out; -- cgit v1.1 From 30647835ffd705bf9915c2990654d731946b9c24 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:03 +0000 Subject: Utilisateur : Fcolin Date : 23/01/01 Heure : 13:12 Archivé dans $/Ivy Commentaire: remove 'using name space std;' (vss 3) --- Ivy/Ivy.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index b0a175e..451a6c7 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -67,7 +67,7 @@ public: virtual ~Ivy(); /* message a emettre sur connection nouvelle application */ - string ready_message; + String ready_message; protected: bool synchronous; // use Window Shink to made CB mono thread like @@ -77,16 +77,16 @@ protected: IvyDirectMessageCallback *direct_callback; IvyApplicationCallback *application_callback; /* list des adresses de broadcast */ - string domain; + String domain; /* nom de l'appliction */ - string appname; + String appname; /* liste des clients connectes */ CRITICAL_SECTION m_application_cs; typedef std::list IvyApplicationList; IvyApplicationList applications; /* liste des souscriptions locale a emettre aux autres applications */ - std::vector regexp_out; + std::vector regexp_out; /* liste des callbacks a appeler */ std::vector< IvyMessageCallback* > callbacks; /* classes de messages emis par l'application utilise pour le filtrage */ -- cgit v1.1 From 214894a6685c10e3a0576e3f2acef2977f3d1b7d Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:05 +0000 Subject: Utilisateur : Fcolin Date : 31/01/01 Heure : 11:18 Archivé dans $/Ivy (vss 4) --- Ivy/Ivy.h | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 451a6c7..e2258b7 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -2,12 +2,9 @@ // ////////////////////////////////////////////////////////////////////// -#if !defined(AFX_BUS_H__F7F08FE9_E653_11D0_AE3E_080009F92591__INCLUDED_) -#define AFX_BUS_H__F7F08FE9_E653_11D0_AE3E_080009F92591__INCLUDED_ -#if _MSC_VER >= 1000 #pragma once -#endif // _MSC_VER >= 1000 + #ifdef WIN32 #ifdef IVY_EXPORTS class _declspec(dllexport) IvyWatcher; @@ -33,18 +30,18 @@ class Ivy { private: - UINT applicationPort; + unsigned short applicationPort; void SendSubscriptions(IvyApplication *app); public: void AddApplication( IvyApplication *app ); void RemoveApplication( IvyApplication *app); - BOOL CheckConnected( IvyApplication *app ); - BOOL CheckRegexp( const char *exp ); + bool CheckConnected( IvyApplication *app ); + bool CheckRegexp( const char *exp ); void CallApplicationConnectedCallback( IvyApplication *app ); void CallApplicationDisconnectedCallback( IvyApplication *app ); - BOOL CallDieCallback( IvyApplication *app, int id, const char *arg ); + bool CallDieCallback( IvyApplication *app, int id, const char *arg ); void CallDirectMessageCallback( IvyApplication *app, int id, const char *arg ); void CallMessageCallback( IvyApplication *app, int id, int argc, const char **argv ); @@ -58,7 +55,7 @@ public: int SendMsg( const char *message ); const char *GetDomain(const char *domainlist); - UINT GetApplicationPort(); + unsigned short GetApplicationPort(); int BindMsg( const char *regexp, IvyMessageCallback *cb ); void UnbindMsg( int id ); Ivy( const char *name, const char* ready, IvyApplicationCallback *callback, bool Synchronous = true ); @@ -67,7 +64,7 @@ public: virtual ~Ivy(); /* message a emettre sur connection nouvelle application */ - String ready_message; + string ready_message; protected: bool synchronous; // use Window Shink to made CB mono thread like @@ -77,22 +74,20 @@ protected: IvyDirectMessageCallback *direct_callback; IvyApplicationCallback *application_callback; /* list des adresses de broadcast */ - String domain; + string domain; /* nom de l'appliction */ - String appname; + string appname; /* liste des clients connectes */ CRITICAL_SECTION m_application_cs; - typedef std::list IvyApplicationList; + typedef list IvyApplicationList; IvyApplicationList applications; /* liste des souscriptions locale a emettre aux autres applications */ - std::vector regexp_out; + vector regexp_out; /* liste des callbacks a appeler */ - std::vector< IvyMessageCallback* > callbacks; + vector< IvyMessageCallback* > callbacks; /* classes de messages emis par l'application utilise pour le filtrage */ int messages_classes_count; const char **messages_classes; }; - -#endif // !defined(AFX_BUS_H__F7F08FE9_E653_11D0_AE3E_080009F92591__INCLUDED_) -- cgit v1.1 From 71900ebe5eb5c5649f3a1743295a97c9edab4fca Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:07 +0000 Subject: Utilisateur : Fcolin Date : 2/02/01 Heure : 18:30 Archivé dans $/Ivy Commentaire: win CE compile not finished (vss 5) --- Ivy/Ivy.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index e2258b7..da73f08 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -10,11 +10,15 @@ class _declspec(dllexport) IvyWatcher; class _declspec(dllexport) IvyApplication; class _declspec(dllexport) Ivy; +class _declspec(dllexport) CThreadedSocket; +class _declspec(dllexport) CBufferedSocket; #else #pragma comment(lib,"Ivy.LIB" ) class _declspec(dllimport) IvyWatcher; class _declspec(dllimport) IvyApplication; class _declspec(dllimport) Ivy; +class _declspec(dllimport) CThreadedSocket; +class _declspec(dllimport) CBufferedSocket; #endif #endif -- cgit v1.1 From de259aa0ec84e486e0c4e41b7b210061c4a469ad Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:09 +0000 Subject: Utilisateur : Fcolin Date : 18/10/01 Heure : 18:32 Archivé dans $/Ivy (vss 6) --- Ivy/Ivy.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index da73f08..77636ed 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -22,8 +22,6 @@ class _declspec(dllimport) CBufferedSocket; #endif #endif -#include "stdafx.h" - #include "IvyCallback.h" class IvyWatcher; -- cgit v1.1 From 5c51566c46abd63b37fea5f64c9b5b8ae5c5df31 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:11 +0000 Subject: Utilisateur : Fcolin Date : 25/10/01 Heure : 18:39 Archivé dans $/Ivy (vss 7) --- Ivy/Ivy.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 77636ed..02538d7 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -22,6 +22,27 @@ class _declspec(dllimport) CBufferedSocket; #endif #endif +#include + +#ifndef UNDER_CE +#define STL +#endif +#ifdef STL +#include +#include +#include + +using std::string; +using std::vector; +using std::list; +#else +#include "DataTypes.h" +#endif + +#pragma warning(disable: 4275) +#pragma warning(disable: 4251) +#pragma warning(disable: 4786) + #include "IvyCallback.h" class IvyWatcher; @@ -51,10 +72,11 @@ public: public: void Classes( int argc, const char **argv ); - + void SendDieMsg( IvyApplication *app ); + IvyApplication *GetApplication(const char *name); void SendDirectMsg( IvyApplication *app, int id, const char *message); void BindDirectMsg( IvyDirectMessageCallback *callback ); - int SendMsg( const char *message ); + int SendMsg( const char *message, ... ); const char *GetDomain(const char *domainlist); unsigned short GetApplicationPort(); -- cgit v1.1 From 068c8777dab6cae18e85f08d8d2425ffcfec0cf7 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:13 +0000 Subject: Utilisateur : Fcolin Date : 19/06/02 Heure : 15:14 Archivé dans $/Ivy (vss 8) --- Ivy/Ivy.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 02538d7..07e18fe 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -53,7 +53,7 @@ class Ivy { private: - unsigned short applicationPort; + unsigned int applicationPort; void SendSubscriptions(IvyApplication *app); public: @@ -79,7 +79,7 @@ public: int SendMsg( const char *message, ... ); const char *GetDomain(const char *domainlist); - unsigned short GetApplicationPort(); + unsigned int GetApplicationPort(); int BindMsg( const char *regexp, IvyMessageCallback *cb ); void UnbindMsg( int id ); Ivy( const char *name, const char* ready, IvyApplicationCallback *callback, bool Synchronous = true ); -- cgit v1.1 From c20e4834742ba86360be15092e34d34845083073 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:15 +0000 Subject: Utilisateur : Fcolin Date : 6/01/03 Heure : 14:47 Archivé dans $/Bus/Ivy Commentaire: (vss 9) --- Ivy/Ivy.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 07e18fe..c861fae 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -52,7 +52,7 @@ class IvyApplication; class Ivy { private: - + int regexp_id; unsigned int applicationPort; void SendSubscriptions(IvyApplication *app); @@ -81,6 +81,7 @@ public: const char *GetDomain(const char *domainlist); unsigned int GetApplicationPort(); int BindMsg( const char *regexp, IvyMessageCallback *cb ); + int BindMsg( IvyMessageCallback *cb, const char *regexp, ... ); void UnbindMsg( int id ); Ivy( const char *name, const char* ready, IvyApplicationCallback *callback, bool Synchronous = true ); void start(const char *domain); -- cgit v1.1 From 239cf6df4b6d30950869b5ecefaeaaacc3eda91b Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:17 +0000 Subject: Utilisateur : Fcolin Date : 1/06/05 Heure : 16:45 Archivé dans $/Bus/Ivy Commentaire: (vss 10) --- Ivy/Ivy.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index c861fae..185f93d 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -24,20 +24,7 @@ class _declspec(dllimport) CBufferedSocket; #include -#ifndef UNDER_CE -#define STL -#endif -#ifdef STL -#include -#include -#include - -using std::string; -using std::vector; -using std::list; -#else #include "DataTypes.h" -#endif #pragma warning(disable: 4275) #pragma warning(disable: 4251) -- cgit v1.1 From bb7e4c76744e4b9684e95757eb58fd6c06560fcb Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:19 +0000 Subject: Utilisateur : Fcolin Date : 2/06/05 Heure : 18:42 Archivé dans $/Bus/Ivy Commentaire: Suppression de la STL et ajout d'un namespace pour les datatypes internes Ivy (vss 11) --- Ivy/Ivy.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 185f93d..7c6b523 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -76,7 +76,7 @@ public: virtual ~Ivy(); /* message a emettre sur connection nouvelle application */ - string ready_message; + ivy::string ready_message; protected: bool synchronous; // use Window Shink to made CB mono thread like @@ -86,18 +86,18 @@ protected: IvyDirectMessageCallback *direct_callback; IvyApplicationCallback *application_callback; /* list des adresses de broadcast */ - string domain; + ivy::string domain; /* nom de l'appliction */ - string appname; + ivy::string appname; /* liste des clients connectes */ CRITICAL_SECTION m_application_cs; - typedef list IvyApplicationList; + typedef ivy::list IvyApplicationList; IvyApplicationList applications; /* liste des souscriptions locale a emettre aux autres applications */ - vector regexp_out; + ivy::vector regexp_out; /* liste des callbacks a appeler */ - vector< IvyMessageCallback* > callbacks; + ivy::vector< IvyMessageCallback* > callbacks; /* classes de messages emis par l'application utilise pour le filtrage */ int messages_classes_count; const char **messages_classes; -- cgit v1.1 From bac78b00bd3f02e949ffa370fb2ae18641c32b23 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:21 +0000 Subject: Utilisateur : Fcolin Date : 16/11/05 Heure : 9:54 Archivé dans $/Bus/Ivy Commentaire: 64 bits ports (vss 12) --- Ivy/Ivy.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 7c6b523..fea2a93 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -26,10 +26,6 @@ class _declspec(dllimport) CBufferedSocket; #include "DataTypes.h" -#pragma warning(disable: 4275) -#pragma warning(disable: 4251) -#pragma warning(disable: 4786) - #include "IvyCallback.h" class IvyWatcher; -- cgit v1.1 From 1e1ff4438b0ccea93ccf5a746ff6c1fd8a3a4666 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:23 +0000 Subject: Utilisateur : Fcolin Date : 17/11/05 Heure : 15:08 Archivé dans $/Bus/Ivy Commentaire: nice Bug in nextArg not reentrant routine due to static variable (vss 13) --- Ivy/Ivy.h | 52 +++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index fea2a93..7536f32 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -28,18 +28,41 @@ class _declspec(dllimport) CBufferedSocket; #include "IvyCallback.h" -class IvyWatcher; - -class IvyApplication; class Ivy { + friend class IvyWatcher; + + friend class IvyApplication; + private: int regexp_id; unsigned int applicationPort; void SendSubscriptions(IvyApplication *app); + bool synchronous; // use Window Shink to made CB mono thread like + IvyApplication * server; + IvyWatcher * watcher; + IvyDieCallback *die_callback; + IvyDirectMessageCallback *direct_callback; + IvyApplicationCallback *application_callback; + /* list des adresses de broadcast */ + ivy::string domain; + /* nom de l'appliction */ + ivy::string appname; + /* liste des clients connectes */ + CRITICAL_SECTION m_application_cs; + typedef ivy::list IvyApplicationList; + IvyApplicationList applications; -public: + /* liste des souscriptions locale a emettre aux autres applications */ + ivy::vector regexp_out; + /* liste des callbacks a appeler */ + ivy::vector< IvyMessageCallback* > callbacks; + /* classes de messages emis par l'application utilise pour le filtrage */ + int messages_classes_count; + const char **messages_classes; + +protected: void AddApplication( IvyApplication *app ); void RemoveApplication( IvyApplication *app); @@ -75,27 +98,6 @@ public: ivy::string ready_message; protected: - bool synchronous; // use Window Shink to made CB mono thread like - IvyApplication * server; - IvyWatcher * watcher; - IvyDieCallback *die_callback; - IvyDirectMessageCallback *direct_callback; - IvyApplicationCallback *application_callback; - /* list des adresses de broadcast */ - ivy::string domain; - /* nom de l'appliction */ - ivy::string appname; - /* liste des clients connectes */ - CRITICAL_SECTION m_application_cs; - typedef ivy::list IvyApplicationList; - IvyApplicationList applications; - /* liste des souscriptions locale a emettre aux autres applications */ - ivy::vector regexp_out; - /* liste des callbacks a appeler */ - ivy::vector< IvyMessageCallback* > callbacks; - /* classes de messages emis par l'application utilise pour le filtrage */ - int messages_classes_count; - const char **messages_classes; }; -- cgit v1.1 From 8760f54d8e7bec49438691895c88278480cf236d Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:25 +0000 Subject: Utilisateur : Fcolin Date : 18/11/05 Heure : 11:46 Archivé dans $/Bus/Ivy Commentaire: repassage a la STL et correction bug multithread (vss 14) --- Ivy/Ivy.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 7536f32..38527ea 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -22,10 +22,20 @@ class _declspec(dllimport) CBufferedSocket; #endif #endif -#include +#ifdef IVY_USE_OWN_DATATYPES #include "DataTypes.h" +#else + +#include +#include +#include + +namespace ivy = std; + +#endif + #include "IvyCallback.h" -- cgit v1.1 From edb7e6c16b0825f319619b9a308e97509447a9e0 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:27 +0000 Subject: Utilisateur : Fcolin Date : 29/11/05 Heure : 18:47 Archivé dans $/Bus/Ivy Commentaire: (vss 15) --- Ivy/Ivy.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 38527ea..806c205 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -107,7 +107,5 @@ public: /* message a emettre sur connection nouvelle application */ ivy::string ready_message; -protected: - }; -- cgit v1.1 From f00e0cfa7fe02afa232ee5d4f3fd634e9ea78c2e Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:29 +0000 Subject: Utilisateur : Fcolin Date : 23/05/06 Heure : 18:18 Archivé dans $/Bus/Ivy Commentaire: Modification protocol UDP (vss 16) --- Ivy/Ivy.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 806c205..ddbc752 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -58,7 +58,9 @@ private: /* list des adresses de broadcast */ ivy::string domain; /* nom de l'appliction */ - ivy::string appname; + ivy::string ApplicationName; + /* Aplication Unique ID */ + ivy::string ApplicationID; /* liste des clients connectes */ CRITICAL_SECTION m_application_cs; typedef ivy::list IvyApplicationList; @@ -84,7 +86,7 @@ protected: void CallDirectMessageCallback( IvyApplication *app, int id, const char *arg ); void CallMessageCallback( IvyApplication *app, int id, int argc, const char **argv ); - + const char *GenApplicationUniqueIdentifier(); public: void Classes( int argc, const char **argv ); -- cgit v1.1 From 1d992982b8385d757a9a9cce4f20077b70bff108 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:31 +0000 Subject: Utilisateur : Fcolin Date : 1/06/06 Heure : 10:14 Archivé dans $/Bus/Ivy Commentaire: ajout Binding Callback et SetFilter (vss 17) --- Ivy/Ivy.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index ddbc752..08977cd 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -55,6 +55,7 @@ private: IvyDieCallback *die_callback; IvyDirectMessageCallback *direct_callback; IvyApplicationCallback *application_callback; + IvyBindingCallback *binding_callback; /* list des adresses de broadcast */ ivy::string domain; /* nom de l'appliction */ @@ -82,14 +83,18 @@ protected: bool CheckRegexp( const char *exp ); void CallApplicationConnectedCallback( IvyApplication *app ); void CallApplicationDisconnectedCallback( IvyApplication *app ); + void CallBindingAddCallback(IvyApplication * app, int id, const char * regexp); + void CallBindingRemoveCallback(IvyApplication * app, int id, const char * regexp); + void CallBindingFilterCallback(IvyApplication * app, int id, const char * regexp); bool CallDieCallback( IvyApplication *app, int id, const char *arg ); void CallDirectMessageCallback( IvyApplication *app, int id, const char *arg ); void CallMessageCallback( IvyApplication *app, int id, int argc, const char **argv ); const char *GenApplicationUniqueIdentifier(); public: - - void Classes( int argc, const char **argv ); + + void SetBindCallback( IvyBindingCallback* bind_callback ); + void SetFilter( int argc, const char **argv ); void SendDieMsg( IvyApplication *app ); IvyApplication *GetApplication(const char *name); void SendDirectMsg( IvyApplication *app, int id, const char *message); -- cgit v1.1 From eb10d0ca0c53bffa9956cb182c662c1df4b5f9f4 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:33 +0000 Subject: Utilisateur : Fcolin Date : 1/06/06 Heure : 15:54 Archivé dans $/Bus/Ivy Commentaire: Separation module de traitement regexp (vss 18) --- Ivy/Ivy.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 08977cd..ee55e22 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -71,16 +71,12 @@ private: ivy::vector regexp_out; /* liste des callbacks a appeler */ ivy::vector< IvyMessageCallback* > callbacks; - /* classes de messages emis par l'application utilise pour le filtrage */ - int messages_classes_count; - const char **messages_classes; - + protected: void AddApplication( IvyApplication *app ); void RemoveApplication( IvyApplication *app); bool CheckConnected( IvyApplication *app ); - bool CheckRegexp( const char *exp ); void CallApplicationConnectedCallback( IvyApplication *app ); void CallApplicationDisconnectedCallback( IvyApplication *app ); void CallBindingAddCallback(IvyApplication * app, int id, const char * regexp); -- cgit v1.1 From c09ff411bfd2401bf1e62ed457c2460ffa338f9e Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:35 +0000 Subject: Utilisateur : Fcolin Date : 6/06/06 Heure : 16:43 Archivé dans $/Bus/Ivy Commentaire: (vss 19) --- Ivy/Ivy.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index ee55e22..fe204f7 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -31,6 +31,7 @@ class _declspec(dllimport) CBufferedSocket; #include #include #include +#include namespace ivy = std; -- cgit v1.1 From 1c9db09141be61792996e21ed2f534c6a1e8eb5e Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:37 +0000 Subject: Utilisateur : Fcolin Date : 9/08/06 Heure : 16:02 Archivé dans $/Bus/Ivy Commentaire: (vss 20) --- Ivy/Ivy.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index fe204f7..9bf137b 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -88,6 +88,10 @@ protected: void CallMessageCallback( IvyApplication *app, int id, int argc, const char **argv ); const char *GenApplicationUniqueIdentifier(); + + /* message a emettre sur connection nouvelle application */ + ivy::string ready_message; + public: void SetBindCallback( IvyBindingCallback* bind_callback ); @@ -108,8 +112,6 @@ public: void stop(); virtual ~Ivy(); - /* message a emettre sur connection nouvelle application */ - ivy::string ready_message; }; -- cgit v1.1 From b990a6aff7b0ff2657f6acf9b63e5a691d3ef2d6 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:39 +0000 Subject: Utilisateur : Fcolin Date : 22/09/06 Heure : 14:54 Archivé dans $/Bus/Ivy Commentaire: (vss 21) --- Ivy/Ivy.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 9bf137b..78e87ca 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -74,6 +74,7 @@ private: ivy::vector< IvyMessageCallback* > callbacks; protected: + void SubstituteInterval (const char *src, char *dst, size_t dst_len); void AddApplication( IvyApplication *app ); void RemoveApplication( IvyApplication *app); -- cgit v1.1 From b357419b3ee411d032ea8a061a2764e52f4356e6 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 12:57:41 +0000 Subject: Utilisateur : Fcolin Date : 22/01/07 Heure : 13:56 Archivé dans $/Bus/Ivy Commentaire: pour eviter les Warning sur les lib standarts (vss 22) --- Ivy/Ivy.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Ivy/Ivy.h') diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h index 78e87ca..cf90bdd 100644 --- a/Ivy/Ivy.h +++ b/Ivy/Ivy.h @@ -4,6 +4,7 @@ #pragma once +#pragma warning(disable: 4251) #ifdef WIN32 #ifdef IVY_EXPORTS -- cgit v1.1