From 500e25c685a49ff50e486a23f2171cd1b737f140 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:37 +0000 Subject: Utilisateur : Fcolin Date : 16/06/00 Heure : 10:14 Créé (vss 1) --- Ivy/IvyApplication.h | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 Ivy/IvyApplication.h (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h new file mode 100644 index 0000000..8884735 --- /dev/null +++ b/Ivy/IvyApplication.h @@ -0,0 +1,80 @@ +#if !defined(AFX_BUSAPPLICATION_H__F7F08FE8_E653_11D0_AE3E_080009F92591__INCLUDED_) +#define AFX_BUSAPPLICATION_H__F7F08FE8_E653_11D0_AE3E_080009F92591__INCLUDED_ + +#if _MSC_VER >= 1000 +#pragma once +#endif // _MSC_VER >= 1000 +// IvyApplication.h : header file +// +#include "BufferedSocket.h" +#include "Ivy.h" + +class Regexp; + +///////////////////////////////////////////////////////////////////////////// +// IvyApplication command target + +class IvyApplication : public CBufferedSocket +{ +// Attributes +public: + + + typedef enum { + + Bye, /* quit l'application ( non utilise ) */ + AddRegexp, /* expression reguliere d'un client */ + Msg, /* message reel */ + Error, /* error message */ + DelRegexp, /* Remove expression reguliere */ + EndRegexp, /* end of the regexp list */ + StartRegexp, /* debut des expressions */ + DirectMsg, /* message direct a destination de l'appli */ + Die /* demande de terminaison de l'appli */ + + }MsgType; + + +// Operations +public: + IvyApplication(Ivy *bus); + virtual ~IvyApplication(); + +// Overrides +public: + BOOL SameApplication( IvyApplication *app ); + UINT remoteService; + const char *GetName(void); + int SendMsg( const char *message ); + void SendMsg( MsgType msg, int id, const char * arg = NULL); + UINT Create(); + void OnReceive( char *line ); + void Create( const char * host, UINT &port ); + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(IvyApplication) + public: + virtual void OnAccept(int nErrorCode); + virtual void OnClose(int nErrorCode); + //}}AFX_VIRTUAL + + // Generated message map functions + //{{AFX_MSG(IvyApplication) + // NOTE - the ClassWizard will add and remove member functions here. + //}}AFX_MSG + +// Implementation +protected: + string appname; + bool AppConnectedCallbackCalled; + Ivy *bus; + /* liste des souscriptions remote */ + vector regexp_in; + +}; + +///////////////////////////////////////////////////////////////////////////// + +//{{AFX_INSERT_LOCATION}} +// Microsoft Developer Studio will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_BUSAPPLICATION_H__F7F08FE8_E653_11D0_AE3E_080009F92591__INCLUDED_) -- cgit v1.1 From e4d99620849c75fa3c993636de25c29a1dd00d2b Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:40 +0000 Subject: Utilisateur : Fcolin Date : 20/07/00 Heure : 10:57 Archivé dans $/Ivy (vss 2) --- Ivy/IvyApplication.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index 8884735..d7823f0 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -68,7 +68,7 @@ protected: bool AppConnectedCallbackCalled; Ivy *bus; /* liste des souscriptions remote */ - vector regexp_in; + map regexp_in; }; -- cgit v1.1 From f244a5f6162f4fa06f78844dc32edb8d23cf1b03 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:41 +0000 Subject: Utilisateur : Fcolin Date : 23/01/01 Heure : 13:12 Archivé dans $/Ivy Commentaire: remove 'using name space std;' (vss 3) --- Ivy/IvyApplication.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index d7823f0..8a31888 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -64,11 +64,11 @@ public: // Implementation protected: - string appname; + String appname; bool AppConnectedCallbackCalled; Ivy *bus; /* liste des souscriptions remote */ - map regexp_in; + std::map regexp_in; }; -- cgit v1.1 From bd891794763914ac8e2aed8530512eabfe5ccdfe Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:43 +0000 Subject: Utilisateur : Fcolin Date : 31/01/01 Heure : 11:18 Archivé dans $/Ivy (vss 4) --- Ivy/IvyApplication.h | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index 8a31888..13e7534 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -1,9 +1,6 @@ -#if !defined(AFX_BUSAPPLICATION_H__F7F08FE8_E653_11D0_AE3E_080009F92591__INCLUDED_) -#define AFX_BUSAPPLICATION_H__F7F08FE8_E653_11D0_AE3E_080009F92591__INCLUDED_ -#if _MSC_VER >= 1000 #pragma once -#endif // _MSC_VER >= 1000 + // IvyApplication.h : header file // #include "BufferedSocket.h" @@ -50,31 +47,16 @@ public: UINT Create(); void OnReceive( char *line ); void Create( const char * host, UINT &port ); - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(IvyApplication) - public: virtual void OnAccept(int nErrorCode); virtual void OnClose(int nErrorCode); - //}}AFX_VIRTUAL - // Generated message map functions - //{{AFX_MSG(IvyApplication) - // NOTE - the ClassWizard will add and remove member functions here. - //}}AFX_MSG // Implementation protected: - String appname; + string appname; bool AppConnectedCallbackCalled; Ivy *bus; /* liste des souscriptions remote */ - std::map regexp_in; + map regexp_in; }; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BUSAPPLICATION_H__F7F08FE8_E653_11D0_AE3E_080009F92591__INCLUDED_) -- cgit v1.1 From b2b0d35764eb7b161b863259fd3c85ff913382ab Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:45 +0000 Subject: Utilisateur : Fcolin Date : 2/02/01 Heure : 18:30 Archivé dans $/Ivy Commentaire: win CE compile not finished (vss 5) --- Ivy/IvyApplication.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index 13e7534..2f97805 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -57,6 +57,7 @@ protected: bool AppConnectedCallbackCalled; Ivy *bus; /* liste des souscriptions remote */ - map regexp_in; + typedef vector RegexpVector; + RegexpVector regexp_in; }; -- cgit v1.1 From 691f8caef0ed2b55a8e481d1dd62ff1fc36856c2 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:47 +0000 Subject: Utilisateur : Fcolin Date : 25/10/01 Heure : 18:39 Archivé dans $/Ivy (vss 6) --- Ivy/IvyApplication.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index 2f97805..8549a30 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -60,4 +60,5 @@ protected: typedef vector RegexpVector; RegexpVector regexp_in; + friend class Ivy; }; -- cgit v1.1 From e3e468ae17cea2149cf3b06bd64167459adf97c9 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:49 +0000 Subject: Utilisateur : Fcolin Date : 14/02/03 Heure : 18:19 Archivé dans $/Bus/Ivy Commentaire: (vss 7) --- Ivy/IvyApplication.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index 8549a30..e39e4a7 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -42,6 +42,7 @@ public: BOOL SameApplication( IvyApplication *app ); UINT remoteService; const char *GetName(void); + inline Ivy *GetBus(void){ return bus;}; int SendMsg( const char *message ); void SendMsg( MsgType msg, int id, const char * arg = NULL); UINT Create(); -- cgit v1.1 From 0c6442aa2e7dbf28f99a76840e005533d0d90b11 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:51 +0000 Subject: Utilisateur : Fcolin Date : 3/03/05 Heure : 14:02 Archivé dans $/Bus/Ivy Commentaire: Passage a la lib PCRE (vss 8) --- Ivy/IvyApplication.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index e39e4a7..906e16c 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -6,7 +6,11 @@ #include "BufferedSocket.h" #include "Ivy.h" -class Regexp; +#ifdef USE_PCRE +#include "pcre.h" +#else +#include "Regexp.h" +#endif ///////////////////////////////////////////////////////////////////////////// // IvyApplication command target @@ -58,7 +62,12 @@ protected: bool AppConnectedCallbackCalled; Ivy *bus; /* liste des souscriptions remote */ - typedef vector RegexpVector; +#ifdef USE_PCRE + static const int max_subexp = 200; + typedef vector RegexpVector; +#else + typedef vector RegexpVector; +#endif RegexpVector regexp_in; friend class Ivy; -- cgit v1.1 From f2dfb0633a7ee0cf6b803d3e8575c3710d98f954 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:53 +0000 Subject: Utilisateur : Fcolin Date : 3/03/05 Heure : 14:13 Archivé dans $/Bus/Ivy Commentaire: (vss 9) --- Ivy/IvyApplication.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index 906e16c..61b4432 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -6,6 +6,8 @@ #include "BufferedSocket.h" #include "Ivy.h" +#define USE_PCRE + #ifdef USE_PCRE #include "pcre.h" #else -- cgit v1.1 From 299c93cb71c2b55321a11be3e14800a6be320081 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:55 +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 10) --- Ivy/IvyApplication.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index 61b4432..7171fef 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -60,15 +60,15 @@ public: // Implementation protected: - string appname; + ivy::string appname; bool AppConnectedCallbackCalled; Ivy *bus; /* liste des souscriptions remote */ #ifdef USE_PCRE static const int max_subexp = 200; - typedef vector RegexpVector; + typedef ivy::vector RegexpVector; #else - typedef vector RegexpVector; + typedef ivy::vector RegexpVector; #endif RegexpVector regexp_in; -- cgit v1.1 From 23bd912a8e86466c79f2dcbed02f4e34e00aca27 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:57 +0000 Subject: Utilisateur : Fcolin Date : 23/05/06 Heure : 18:18 Archivé dans $/Bus/Ivy Commentaire: Modification protocol UDP (vss 11) --- Ivy/IvyApplication.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index 7171fef..babd82e 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -53,7 +53,7 @@ public: void SendMsg( MsgType msg, int id, const char * arg = NULL); UINT Create(); void OnReceive( char *line ); - void Create( const char * host, UINT &port ); + void Create( const char * host, UINT &port, const char* name ); virtual void OnAccept(int nErrorCode); virtual void OnClose(int nErrorCode); -- cgit v1.1 From f9406cab857e7eb87627c014a880ed859df3bf22 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:00:59 +0000 Subject: Utilisateur : Fcolin Date : 1/06/06 Heure : 10:14 Archivé dans $/Bus/Ivy Commentaire: ajout Binding Callback et SetFilter (vss 12) --- Ivy/IvyApplication.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index babd82e..ffa6ecb 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -64,6 +64,9 @@ protected: bool AppConnectedCallbackCalled; Ivy *bus; /* liste des souscriptions remote */ + /* en clair */ + ivy::vector regexp_str_in; + /* compile */ #ifdef USE_PCRE static const int max_subexp = 200; typedef ivy::vector RegexpVector; -- cgit v1.1 From 224519ededa0125951cf0ca7e13a2b25952321e6 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:01:01 +0000 Subject: Utilisateur : Fcolin Date : 1/06/06 Heure : 15:54 Archivé dans $/Bus/Ivy Commentaire: Separation module de traitement regexp (vss 13) --- Ivy/IvyApplication.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index ffa6ecb..c32ca5f 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -5,14 +5,7 @@ // #include "BufferedSocket.h" #include "Ivy.h" - -#define USE_PCRE - -#ifdef USE_PCRE -#include "pcre.h" -#else -#include "Regexp.h" -#endif +#include "IvyBinding.h" ///////////////////////////////////////////////////////////////////////////// // IvyApplication command target @@ -67,12 +60,7 @@ protected: /* en clair */ ivy::vector regexp_str_in; /* compile */ -#ifdef USE_PCRE - static const int max_subexp = 200; - typedef ivy::vector RegexpVector; -#else - typedef ivy::vector RegexpVector; -#endif + typedef ivy::vector RegexpVector; RegexpVector regexp_in; friend class Ivy; -- cgit v1.1 From fbbba9efa5f7e22b7d6d824b5126af3e20c0479e Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:01:03 +0000 Subject: Utilisateur : Fcolin Date : 1/06/06 Heure : 16:40 Archivé dans $/Bus/Ivy Commentaire: correction bug du a la separation du module regexp transformation des tables de regexp en table de Hash (vss 14) --- Ivy/IvyApplication.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index c32ca5f..64aa49f 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -58,10 +58,10 @@ protected: Ivy *bus; /* liste des souscriptions remote */ /* en clair */ - ivy::vector regexp_str_in; + ivy::map regexp_str_in; /* compile */ - typedef ivy::vector RegexpVector; - RegexpVector regexp_in; + typedef ivy::map Bindings; + Bindings regexp_in; friend class Ivy; }; -- cgit v1.1 From 74967da76a4c47cc6ca1223eb4be776d2a83745a Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:01:05 +0000 Subject: Utilisateur : Fcolin Date : 1/08/06 Heure : 9:48 Archivé dans $/Bus/Ivy Commentaire: (vss 15) --- Ivy/IvyApplication.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Ivy/IvyApplication.h') diff --git a/Ivy/IvyApplication.h b/Ivy/IvyApplication.h index 64aa49f..7191400 100644 --- a/Ivy/IvyApplication.h +++ b/Ivy/IvyApplication.h @@ -26,7 +26,9 @@ public: EndRegexp, /* end of the regexp list */ StartRegexp, /* debut des expressions */ DirectMsg, /* message direct a destination de l'appli */ - Die /* demande de terminaison de l'appli */ + Die, /* demande de terminaison de l'appli */ + Ping, /* message de controle ivy */ + Pong /* ivy doit renvoyer ce message à la reception d'un ping */ }MsgType; -- cgit v1.1