Fix name collision

diff --git a/projects/stargazer/plugins/other/smux/handlers.cpp b/projects/stargazer/plugins/other/smux/handlers.cpp
index f0f3a8c1d097996927ea6eb9408f64dcb179797f..5fb3dfda7796e040f0bf729d7adbe69376ee48ce 100644 (file)
--- a/projects/stargazer/plugins/other/smux/handlers.cpp
+++ b/projects/stargazer/plugins/other/smux/handlers.cpp
@@ -27,7 +27,7 @@ asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
 return false;
 }
 
 return false;
 }
 

-bool SMUX::PDUsHandler(const SMUX_PDUs_t * pdus)
+bool SMUX::PDUsRequestHandler(const SMUX_PDUs_t * pdus)

 {
 printfd(__FILE__, "SMUX::PDUsHandler()\n");
 asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
 {
 printfd(__FILE__, "SMUX::PDUsHandler()\n");
 asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);

diff --git a/projects/stargazer/plugins/other/smux/smux.cpp b/projects/stargazer/plugins/other/smux/smux.cpp
index 11fda6edbd10ce1baa00b14a0c3308e95a6a8837..01d9bb2151406b1d4d85aaf52fcd189a1bbdbbfe 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.cpp
+++ b/projects/stargazer/plugins/other/smux/smux.cpp
@@ -358,7 +358,7 @@ pthread_mutex_init(&mutex, NULL);
 
 smuxHandlers[SMUX_PDUs_PR_close] = &SMUX::CloseHandler;
 smuxHandlers[SMUX_PDUs_PR_registerResponse] = &SMUX::RegisterResponseHandler;
 
 smuxHandlers[SMUX_PDUs_PR_close] = &SMUX::CloseHandler;
 smuxHandlers[SMUX_PDUs_PR_registerResponse] = &SMUX::RegisterResponseHandler;

-smuxHandlers[SMUX_PDUs_PR_pdus] = &SMUX::PDUsHandler;
+smuxHandlers[SMUX_PDUs_PR_pdus] = &SMUX::PDUsRequestHandler;

 smuxHandlers[SMUX_PDUs_PR_commitOrRollback] = &SMUX::CommitOrRollbackHandler;
 
 pdusHandlers[PDUs_PR_get_request] = &SMUX::GetRequestHandler;
 smuxHandlers[SMUX_PDUs_PR_commitOrRollback] = &SMUX::CommitOrRollbackHandler;
 
 pdusHandlers[PDUs_PR_get_request] = &SMUX::GetRequestHandler;

diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h
index c5b94d4c822bb190f7216c4aa15ea2fa9385c8d8..25b7ff4b5174bc199614faea2557b25125089705 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -80,7 +80,7 @@ private:
 
     bool CloseHandler(const SMUX_PDUs_t * pdus);
     bool RegisterResponseHandler(const SMUX_PDUs_t * pdus);
 
     bool CloseHandler(const SMUX_PDUs_t * pdus);
     bool RegisterResponseHandler(const SMUX_PDUs_t * pdus);

-    bool PDUsHandler(const SMUX_PDUs_t * pdus);
+    bool PDUsRequestHandler(const SMUX_PDUs_t * pdus);

     bool CommitOrRollbackHandler(const SMUX_PDUs_t * pdus);
 
     bool GetRequestHandler(const PDUs_t * pdus);
     bool CommitOrRollbackHandler(const SMUX_PDUs_t * pdus);
 
     bool GetRequestHandler(const PDUs_t * pdus);