4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-28 18:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

daemon_ipc_handlers: ctor/dtor cleanup

Browse Source 
Reset pointers to NULL when stopped, stop if trying to init
a non stop server, remove copy pasted doc block that doesn't
make sense for stop.
This commit is contained in:
moneromooo-monero 2015-10-31 10:09:24 +00:00
parent 424d09bc14
commit 33a87469c0
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ipc/daemon_ipc_handlers.cpp
View File

@ -47,11 +47,11 @@
*/ */
namespace namespace
{ {
cryptonote::core *core; /*!< Pointer to the core */ cryptonote::core *core = NULL; /*!< Pointer to the core */
nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> > *p2p; nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> > *p2p = NULL;
/*!< Pointer to p2p node server */ /*!< Pointer to p2p node server */
zactor_t *server; /*!< 0MQ server */ zactor_t *server = NULL; /*!< 0MQ server */
bool testnet; /*!< testnet mode or not */ bool testnet = false; /*!< testnet mode or not */
/*! /*!
* \brief Checks if core is busy * \brief Checks if core is busy
@ -126,6 +126,8 @@ namespace IPC
nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> > &p_p2p, nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> > &p_p2p,
bool p_testnet) bool p_testnet)
{ {
if (server)
stop();
p2p = &p_p2p; p2p = &p_p2p;
core = &p_core; core = &p_core;
testnet = p_testnet; testnet = p_testnet;
@ -136,13 +138,12 @@ namespace IPC
/*! /*!
* \brief stops the IPC server * \brief stops the IPC server
*
* \param p_core cryptonote core object
* \param p_p2p p2p object
* \param p_testnet testnet mode or not
*/ */
void stop() { void stop() {
zactor_destroy(&server); zactor_destroy(&server);
server = NULL;
p2p = NULL;
core = NULL;
} }
/*! /*!