diff options
| author | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2015-01-30 20:10:57 +0000 |
|---|---|---|
| committer | Anton <anton@picapica> | 2015-03-10 03:42:49 +0400 |
| commit | c6f557b7259ee8c8b5d71706abd3ac9b6db0bff8 (patch) | |
| tree | eb368215a32d772989263813490674fa320e5778 /pica-client/skynet.cpp | |
| parent | 74419352eeeb2e7b8717978f782d20ff788c0e56 (diff) | |
| download | pica-pica-c6f557b7259ee8c8b5d71706abd3ac9b6db0bff8.tar.gz pica-pica-c6f557b7259ee8c8b5d71706abd3ac9b6db0bff8.zip | |
renamed structs PICA_conninfo to PICA_c2n (client-to-node) and PICA_chaninfo to PICA_c2c (client-to-client)
git-svn-id: svn://localhost/project_picapica/trunk@340 fb96df88-216d-11de-830c-f3023f12d8ac
Diffstat (limited to 'pica-client/skynet.cpp')
| -rw-r--r-- | pica-client/skynet.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/pica-client/skynet.cpp b/pica-client/skynet.cpp index 54b1a85..fda9a31 100644 --- a/pica-client/skynet.cpp +++ b/pica-client/skynet.cpp @@ -89,7 +89,7 @@ void SkyNet::nodethread_connected(QString addr, quint16 port, NodeThread *thread { int ret; write_mutex.lock(); - struct PICA_chaninfo *chan = NULL; + struct PICA_c2c *chan = NULL; ret = PICA_create_channel(nodelink, (const unsigned char*)c2c_peer_ids[i].constData(), &chan); @@ -181,7 +181,7 @@ void SkyNet::timerEvent(QTimerEvent *e) { int ret; - struct PICA_chaninfo *chan = NULL; + struct PICA_c2c *chan = NULL; ret = PICA_create_channel(nodelink, (const unsigned char*)c2c_peer_ids[i].constData(), &chan); @@ -240,7 +240,7 @@ bool SkyNet::isSelfAware() void SkyNet::SendFile(QByteArray to, QString filepath) { int ret = PICA_OK; -struct PICA_chaninfo *iptr; +struct PICA_c2c *iptr; write_mutex.lock();//<< @@ -263,7 +263,7 @@ if ( (iptr = find_active_chan(to)) ) } else { - struct PICA_chaninfo *chan = NULL; + struct PICA_c2c *chan = NULL; ret = PICA_create_channel(nodelink, (const unsigned char*)to.constData(), &chan); @@ -283,7 +283,7 @@ write_mutex.unlock();//>> void SkyNet::AcceptFile(QByteArray from, QString filepath) { int ret = PICA_OK; -struct PICA_chaninfo *iptr; +struct PICA_c2c *iptr; write_mutex.lock();//<< if ( (iptr = find_active_chan(from)) ) @@ -302,7 +302,7 @@ write_mutex.unlock();//>> void SkyNet::DenyFile(QByteArray from) { int ret = PICA_OK; -struct PICA_chaninfo *iptr; +struct PICA_c2c *iptr; write_mutex.lock();//<< if ( (iptr = find_active_chan(from)) ) @@ -321,7 +321,7 @@ write_mutex.unlock();//>> void SkyNet::PauseFile(QByteArray peer_id, bool pause_sending) { int ret = PICA_OK; -struct PICA_chaninfo *iptr; +struct PICA_c2c *iptr; write_mutex.lock();//<< if ( (iptr = find_active_chan(peer_id)) ) @@ -340,7 +340,7 @@ write_mutex.unlock();//>> void SkyNet::ResumeFile(QByteArray peer_id, bool resume_sending) { int ret = PICA_OK; -struct PICA_chaninfo *iptr; +struct PICA_c2c *iptr; write_mutex.lock();//<< if ( (iptr = find_active_chan(peer_id)) ) @@ -358,7 +358,7 @@ write_mutex.unlock();//>> void SkyNet::CancelFile(QByteArray peer_id, bool cancel_sending) { int ret = PICA_OK; -struct PICA_chaninfo *iptr; +struct PICA_c2c *iptr; write_mutex.lock();//<< if ( (iptr = find_active_chan(peer_id)) ) @@ -376,7 +376,7 @@ write_mutex.unlock();//>> void SkyNet::SendMessage(QByteArray to, QString msg) { int ret = PICA_OK; -struct PICA_chaninfo *iptr; +struct PICA_c2c *iptr; write_mutex.lock();//<< @@ -399,7 +399,7 @@ if ( (iptr = find_active_chan(to)) ) } else { - struct PICA_chaninfo *chan = NULL; + struct PICA_c2c *chan = NULL; ret = PICA_create_channel(nodelink, (const unsigned char*)to.constData(), &chan); @@ -418,7 +418,7 @@ write_mutex.unlock();//>> void SkyNet::flush_queues(QByteArray to) { - struct PICA_chaninfo *chan; + struct PICA_c2c *chan; int ret; if (self_aware && (msgqueues.contains(to) || sndfilequeues.contains(to))) @@ -466,12 +466,12 @@ void SkyNet::flush_queues(QByteArray to) } } -struct PICA_chaninfo * SkyNet::find_active_chan(QByteArray peer_id) +struct PICA_c2c * SkyNet::find_active_chan(QByteArray peer_id) { if (!nodelink) return NULL; -struct PICA_chaninfo *iptr = nodelink->chan_list_head; +struct PICA_c2c *iptr = nodelink->chan_list_head; while(iptr) { @@ -491,7 +491,7 @@ QList<QByteArray> SkyNet::filter_existing_chans(QList<QByteArray> peer_ids) if (!nodelink) return ret; - struct PICA_chaninfo *iptr = nodelink->chan_list_head; + struct PICA_c2c *iptr = nodelink->chan_list_head; while(iptr) { |