aboutsummaryrefslogtreecommitdiff
path: root/src/p2p
diff options
context:
space:
mode:
authorZachary Michaels <mikezackles@gmail.com>2014-06-27 13:21:48 -0400
committerZachary Michaels <mikezackles@gmail.com>2014-07-01 14:57:26 -0400
commit17f09674726295afed09a5fc2b9948298ec5332e (patch)
tree782273b3b0cc1ceaa865c50fc7620d277290344c /src/p2p
parentExplicit error constructors (diff)
downloadmonero-17f09674726295afed09a5fc2b9948298ec5332e.tar.xz
Allow priority peers when there are exclusive peers
Per my reading this change makes sense since a subset of the exclusive peers could be priority peers. Priority peers that are not exclusive will not get loaded, and priority peers that *are* exclusive will get special treatment. Prior to this change it looks like priority peers were silently ignored when exclusive peers were provided.
Diffstat (limited to 'src/p2p')
-rw-r--r--src/p2p/net_node.inl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 16140cf35..fd1f57658 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -130,7 +130,7 @@ namespace nodetool
if (!parse_peers_and_add_to_container(vm, arg_p2p_add_exclusive_node, m_exclusive_peers))
return false;
}
- else if (command_line::has_arg(vm, arg_p2p_add_priority_node))
+ if (command_line::has_arg(vm, arg_p2p_add_priority_node))
{
if (!parse_peers_and_add_to_container(vm, arg_p2p_add_priority_node, m_priority_peers))
return false;