lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' into changetracking 

Conflicts:
	libethereum/PeerSession.cpp
cl-refactor
Gav Wood 11 years ago
parent
b389052eeb 7ffa513586
commit
931827140c
6 changed files with 114 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      alethzero/Main.ui
  2. 4
      alethzero/MainWin.cpp
  3. 13
      libethereum/PeerServer.cpp
  4. 121
      libethereum/PeerSession.cpp
  5. 8
      libethereum/PeerSession.h
  6. 4
      walleth/MainWin.cpp

57
alethzero/Main.ui
View File

@ -269,7 +269,7 @@
</widget> </widget>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="1"> <item row="1" column="2">
<widget class="QSpinBox" name="port"> <widget class="QSpinBox" name="port">
<property name="minimum"> <property name="minimum">
<number>1024</number> <number>1024</number>
@ -282,53 +282,66 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="idealPeers"> <widget class="QLineEdit" name="forceAddress">
<property name="minimum"> <property name="inputMask">
<number>1</number> <string/>
</property> </property>
<property name="value"> <property name="text">
<number>5</number> <string/>
</property>
<property name="placeholderText">
<string>Automatic</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Ideal &amp;Peers</string> <string>&amp;Listen on</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>idealPeers</cstring> <cstring>port</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>&amp;Client Name</string> <string>Ideal &amp;Peers</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>clientName</cstring> <cstring>idealPeers</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="1" colspan="2">
<widget class="QLabel" name="label"> <widget class="QSpinBox" name="idealPeers">
<property name="text"> <property name="minimum">
<string>&amp;Listen on</string> <number>1</number>
</property> </property>
<property name="buddy"> <property name="value">
<cstring>port</cstring> <number>5</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1" colspan="2">
<widget class="QLineEdit" name="clientName"> <widget class="QLineEdit" name="clientName">
<property name="placeholderText"> <property name="placeholderText">
<string>Anonymous</string> <string>Anonymous</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>&amp;Client Name</string>
</property>
<property name="buddy">
<cstring>clientName</cstring>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

4
alethzero/MainWin.cpp
View File

@ -469,6 +469,7 @@ void Main::writeSettings()
s.setValue("address", b); s.setValue("address", b);
s.setValue("upnp", ui->upnp->isChecked()); s.setValue("upnp", ui->upnp->isChecked());
s.setValue("forceAddress", ui->forceAddress->text());
s.setValue("usePast", ui->usePast->isChecked()); s.setValue("usePast", ui->usePast->isChecked());
s.setValue("paranoia", ui->paranoia->isChecked()); s.setValue("paranoia", ui->paranoia->isChecked());
s.setValue("showAll", ui->showAll->isChecked()); s.setValue("showAll", ui->showAll->isChecked());
@ -515,6 +516,7 @@ void Main::readSettings()
m_client->setAddress(m_myKeys.back().address()); m_client->setAddress(m_myKeys.back().address());
m_peers = s.value("peers").toByteArray(); m_peers = s.value("peers").toByteArray();
ui->upnp->setChecked(s.value("upnp", true).toBool()); ui->upnp->setChecked(s.value("upnp", true).toBool());
ui->forceAddress->setText(s.value("forceAddress", "").toString());
ui->usePast->setChecked(s.value("usePast", true).toBool()); ui->usePast->setChecked(s.value("usePast", true).toBool());
ui->paranoia->setChecked(s.value("paranoia", false).toBool()); ui->paranoia->setChecked(s.value("paranoia", false).toBool());
ui->showAll->setChecked(s.value("showAll", false).toBool()); ui->showAll->setChecked(s.value("showAll", false).toBool());
@ -1386,7 +1388,7 @@ void Main::on_net_triggered()
m_client->setClientVersion(n); m_client->setClientVersion(n);
if (ui->net->isChecked()) if (ui->net->isChecked())
{ {
m_client->startNetwork(ui->port->value(), string(), 0, NodeMode::Full, ui->idealPeers->value(), std::string(), ui->upnp->isChecked()); m_client->startNetwork(ui->port->value(), string(), 0, NodeMode::Full, ui->idealPeers->value(), ui->forceAddress->text().toStdString(), ui->upnp->isChecked());
if (m_peers.size() && ui->usePast->isChecked()) if (m_peers.size() && ui->usePast->isChecked())
m_client->peerServer()->restorePeers(bytesConstRef((byte*)m_peers.data(), m_peers.size())); m_client->peerServer()->restorePeers(bytesConstRef((byte*)m_peers.data(), m_peers.size()));
} }

13
libethereum/PeerServer.cpp
View File

@ -117,6 +117,19 @@ unsigned PeerServer::protocolVersion()
return c_protocolVersion; return c_protocolVersion;
} }
void PeerServer::seal(bytes& _b)
{
_b[0] = 0x22;
_b[1] = 0x40;
_b[2] = 0x08;
_b[3] = 0x91;
uint32_t len = (uint32_t)_b.size() - 8;
_b[4] = (len >> 24) & 0xff;
_b[5] = (len >> 16) & 0xff;
_b[6] = (len >> 8) & 0xff;
_b[7] = len & 0xff;
}
void PeerServer::determinePublic(string const& _publicAddress, bool _upnp) void PeerServer::determinePublic(string const& _publicAddress, bool _upnp)
{ {
if (_upnp) if (_upnp)

121
libethereum/PeerSession.cpp
View File

@ -31,13 +31,12 @@ using namespace eth;
#define clogS(X) eth::LogOutputStream<X, true>(false) << "| " << std::setw(2) << m_socket.native_handle() << "] " #define clogS(X) eth::LogOutputStream<X, true>(false) << "| " << std::setw(2) << m_socket.native_handle() << "] "
static const eth::uint c_maxHashes = 32; ///< Maximum number of hashes GetChain will ever send. static const eth::uint c_maxHashes = 4096; ///< Maximum number of hashes GetChain will ever send.
static const eth::uint c_maxBlocks = 64; ///< Maximum number of blocks Blocks will ever send. BUG: if this gets too big (e.g. 2048) stuff starts going wrong. static const eth::uint c_maxBlocks = 2048; ///< Maximum number of blocks Blocks will ever send.
static const eth::uint c_maxBlocksAsk = 256; ///< Maximum number of blocks we ask to receive in Blocks (when using GetChain). static const eth::uint c_maxBlocksAsk = 512; ///< Maximum number of blocks we ask to receive in Blocks (when using GetChain).
PeerSession::PeerSession(PeerServer* _s, bi::tcp::socket _socket, uint _rNId, bi::address _peerAddress, unsigned short _peerPort): PeerSession::PeerSession(PeerServer* _s, bi::tcp::socket _socket, uint _rNId, bi::address _peerAddress, unsigned short _peerPort):
m_server(_s), m_server(_s),
m_strand(_socket.get_io_service()),
m_socket(std::move(_socket)), m_socket(std::move(_socket)),
m_reqNetworkId(_rNId), m_reqNetworkId(_rNId),
m_listenPort(_peerPort), m_listenPort(_peerPort),
@ -50,24 +49,23 @@ PeerSession::PeerSession(PeerServer* _s, bi::tcp::socket _socket, uint _rNId, bi
PeerSession::~PeerSession() PeerSession::~PeerSession()
{ {
m_strand.post([=]() // Read-chain finished for one reason or another.
try
{ {
if (!m_writeq.empty()) if (m_socket.is_open())
m_writeq.clear(); m_socket.close();
}
try { catch (...){}
if (m_socket.is_open())
m_socket.close();
}catch (...){}
});
} }
bi::tcp::endpoint PeerSession::endpoint() const bi::tcp::endpoint PeerSession::endpoint() const
{ {
if (m_socket.is_open()) if (m_socket.is_open())
try { try
{
return bi::tcp::endpoint(m_socket.remote_endpoint().address(), m_listenPort); return bi::tcp::endpoint(m_socket.remote_endpoint().address(), m_listenPort);
} catch (...){} }
catch (...){}
return bi::tcp::endpoint(); return bi::tcp::endpoint();
} }
@ -395,19 +393,6 @@ RLPStream& PeerSession::prep(RLPStream& _s)
return _s.appendRaw(bytes(8, 0)); return _s.appendRaw(bytes(8, 0));
} }
void PeerServer::seal(bytes& _b)
{
_b[0] = 0x22;
_b[1] = 0x40;
_b[2] = 0x08;
_b[3] = 0x91;
uint32_t len = (uint32_t)_b.size() - 8;
_b[4] = (len >> 24) & 0xff;
_b[5] = (len >> 16) & 0xff;
_b[6] = (len >> 8) & 0xff;
_b[7] = len & 0xff;
}
void PeerSession::sealAndSend(RLPStream& _s) void PeerSession::sealAndSend(RLPStream& _s)
{ {
bytes b; bytes b;
@ -441,7 +426,7 @@ void PeerSession::sendDestroy(bytes& _msg)
} }
bytes buffer = bytes(std::move(_msg)); bytes buffer = bytes(std::move(_msg));
m_strand.post(boost::bind(&PeerSession::writeImpl, this, buffer)); writeImpl(buffer);
} }
void PeerSession::send(bytesConstRef _msg) void PeerSession::send(bytesConstRef _msg)
@ -454,59 +439,66 @@ void PeerSession::send(bytesConstRef _msg)
} }
bytes buffer = bytes(_msg.toBytes()); bytes buffer = bytes(_msg.toBytes());
m_strand.post(boost::bind(&PeerSession::writeImpl, this, buffer)); writeImpl(buffer);
} }
void PeerSession::writeImpl(bytes& _buffer) void PeerSession::writeImpl(bytes& _buffer)
{ {
m_writeq.push_back(_buffer); // cerr << (void*)this << " writeImpl" << endl;
if (m_writeq.size() > 1) if (!m_socket.is_open())
return; return;
write(); lock_guard<recursive_mutex> l(m_writeLock);
m_writeQueue.push_back(_buffer);
if (m_writeQueue.size() == 1)
write();
} }
void PeerSession::write() void PeerSession::write()
{ {
if (m_writeq.empty()) // cerr << (void*)this << " write" << endl;
lock_guard<recursive_mutex> l(m_writeLock);
if (m_writeQueue.empty())
return; return;
const bytes& bytes = m_writeq[0]; const bytes& bytes = m_writeQueue[0];
if (m_socket.is_open()) auto self(shared_from_this());
ba::async_write(m_socket, ba::buffer(bytes), m_strand.wrap([this](boost::system::error_code ec, std::size_t /*length*/) ba::async_write(m_socket, ba::buffer(bytes), [this, self](boost::system::error_code ec, std::size_t /*length*/)
{
// cerr << (void*)this << " write.callback" << endl;
// must check queue, as write callback can occur following dropped()
if (ec)
{ {
// must check que, as write callback can occur following dropped() cwarn << "Error sending: " << ec.message();
if (!m_writeq.empty()) dropped();
m_writeq.pop_front(); }
else
if (ec) {
{ m_writeQueue.pop_front();
cwarn << "Error sending: " << ec.message(); write();
dropped(); }
} else });
m_strand.post(boost::bind(&PeerSession::write, this));
}));
} }
void PeerSession::dropped() void PeerSession::dropped()
{ {
// cerr << (void*)this << " dropped" << endl;
if (m_socket.is_open()) if (m_socket.is_open())
try { try
{
clogS(NetNote) << "Closing " << m_socket.remote_endpoint(); clogS(NetNote) << "Closing " << m_socket.remote_endpoint();
m_socket.close(); m_socket.close();
}catch (...){} }
catch (...) {}
// block future writes by running in strand and clearing queue
m_strand.post([=]() // Remove from peer server
{ for (auto i = m_server->m_peers.begin(); i != m_server->m_peers.end(); ++i)
m_writeq.clear(); if (i->second.lock().get() == this)
for (auto i = m_server->m_peers.begin(); i != m_server->m_peers.end(); ++i) {
if (i->second.lock().get() == this) m_server->m_peers.erase(i);
{ break;
m_server->m_peers.erase(i); }
break;
}
});
} }
void PeerSession::disconnect(int _reason) void PeerSession::disconnect(int _reason)
@ -555,7 +547,7 @@ void PeerSession::doRead()
cwarn << "Error reading: " << ec.message(); cwarn << "Error reading: " << ec.message();
dropped(); dropped();
} }
else if(ec && length == 0) else if (ec && length == 0)
{ {
return; return;
} }
@ -568,10 +560,7 @@ void PeerSession::doRead()
while (m_incoming.size() > 8) while (m_incoming.size() > 8)
{ {
if (m_incoming[0] != 0x22 || m_incoming[1] != 0x40 || m_incoming[2] != 0x08 || m_incoming[3] != 0x91) if (m_incoming[0] != 0x22 || m_incoming[1] != 0x40 || m_incoming[2] != 0x08 || m_incoming[3] != 0x91)
{
doRead(); doRead();
}
else else
{ {
uint32_t len = fromBigEndian<uint32_t>(bytesConstRef(m_incoming.data() + 4, 4)); uint32_t len = fromBigEndian<uint32_t>(bytesConstRef(m_incoming.data() + 4, 4));

8
libethereum/PeerSession.h
View File

@ -21,6 +21,7 @@
#pragma once #pragma once
#include <mutex>
#include <array> #include <array>
#include <set> #include <set>
#include <memory> #include <memory>
@ -65,8 +66,9 @@ private:
void writeImpl(bytes& _buffer); void writeImpl(bytes& _buffer);
void write(); void write();
PeerServer* m_server; PeerServer* m_server;
boost::asio::strand m_strand;
std::deque<bytes> m_writeq; std::recursive_mutex m_writeLock;
std::deque<bytes> m_writeQueue;
bi::tcp::socket m_socket; bi::tcp::socket m_socket;
std::array<byte, 65536> m_data; std::array<byte, 65536> m_data;
@ -89,6 +91,8 @@ private:
std::set<h256> m_knownBlocks; std::set<h256> m_knownBlocks;
std::set<h256> m_knownTransactions; std::set<h256> m_knownTransactions;
bool m_willBeDeleted = false; ///< True if we already posted a deleter on the strand.
}; };
} }

4
walleth/MainWin.cpp
View File

@ -239,10 +239,10 @@ void Main::on_net_triggered(bool _auto)
if (_auto) if (_auto)
{ {
QString s = m_servers[rand() % m_servers.size()]; QString s = m_servers[rand() % m_servers.size()];
client()->startNetwork(m_port, s.section(':', 0, 0).toStdString(), s.section(':', 1).toInt(), NodeMode::Full, m_idealPeers, std::string(), ui->upnp->isChecked()); client()->startNetwork(m_port, s.section(':', 0, 0).toStdString(), s.section(':', 1).toInt(), NodeMode::Full, m_idealPeers, "", ui->upnp->isChecked());
} }
else else
client()->startNetwork(m_port, string(), 0, NodeMode::Full, m_idealPeers, std::string(), ui->upnp->isChecked()); client()->startNetwork(m_port, string(), 0, NodeMode::Full, m_idealPeers, "", ui->upnp->isChecked());
if (m_peers.size()) if (m_peers.size())
client()->peerServer()->restorePeers(bytesConstRef((byte*)m_peers.data(), m_peers.size())); client()->peerServer()->restorePeers(bytesConstRef((byte*)m_peers.data(), m_peers.size()));
} }

Write Preview
Loading…
Cancel
Save