Skip to content
This repository has been archived by the owner on Jan 6, 2020. It is now read-only.

Maid 843 integration with crux #137

Open
wants to merge 96 commits into
base: next
Choose a base branch
from
Open

Maid 843 integration with crux #137

wants to merge 96 commits into from

Conversation

inetic
Copy link
Contributor

@inetic inetic commented Mar 26, 2015

No description provided.

BSMaidSafe and others added 30 commits February 27, 2015 17:46
Exchanges how each connection sees the other one
It is the endpoint we receive from the other end after
being connected. It represents us as seen from the other end.
to find out its external endpoint.
Validated and non validated connections are now
accepted through only one handler. Also acceptation
starts on the 5483 port and if it is already taken a
random port is chosen.
Fraser999 and others added 30 commits March 20, 2015 15:12
Conflicts:
	include/maidsafe/routing/routing_node.h
	src/maidsafe/routing/connection_manager.cc
	src/maidsafe/routing/connection_manager.h
	src/maidsafe/routing/tests/routing_connection_manager_check_in_group.cc
	src/maidsafe/routing/tests/sentinel_test.cc
…egration-with-crux

Conflicts:
	src/maidsafe/routing/tests/routing_connection_manager_check_in_group.cc
…h-crux' into inetic-MAID-843-integration-with-crux
…netic/MaidSafe-Routing into inetic-MAID-843-integration-with-crux

Conflicts:
	include/maidsafe/routing/routing_node.h
…andraprakash/MaidSafe-Routing into MAID-843-integration-with-crux

Conflicts:
	include/maidsafe/routing/routing_node.h
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants