diff options
author | Florian Dold <florian.dold@gmail.com> | 2013-04-16 18:32:56 +0000 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2013-04-16 18:32:56 +0000 |
commit | e77e2db24ef3681f207521e539a2c1ca3584efda (patch) | |
tree | 1bb5afd004527fa6ce1ca213571dcbc60fa55ef6 /src/consensus | |
parent | c5a460ec22898e2ce2c5c5b1d1a2abb083b8fc8d (diff) | |
download | gnunet-e77e2db24ef3681f207521e539a2c1ca3584efda.tar.gz gnunet-e77e2db24ef3681f207521e539a2c1ca3584efda.zip |
added skeleton for gnunet set
Diffstat (limited to 'src/consensus')
-rw-r--r-- | src/consensus/gnunet-service-consensus.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index 179df0fb0..a7640c51f 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c | |||
@@ -2279,7 +2279,7 @@ add_incoming_peers (struct ConsensusSession *session) | |||
2279 | static void | 2279 | static void |
2280 | initialize_session (struct ConsensusSession *session) | 2280 | initialize_session (struct ConsensusSession *session) |
2281 | { | 2281 | { |
2282 | const struct ConsensusSession *other_session; | 2282 | struct ConsensusSession *other_session; |
2283 | 2283 | ||
2284 | GNUNET_assert (NULL != session->join_msg); | 2284 | GNUNET_assert (NULL != session->join_msg); |
2285 | initialize_session_peer_list (session); | 2285 | initialize_session_peer_list (session); |
@@ -2295,17 +2295,13 @@ initialize_session (struct ConsensusSession *session) | |||
2295 | { | 2295 | { |
2296 | if (GNUNET_NO == other_session->conclude) | 2296 | if (GNUNET_NO == other_session->conclude) |
2297 | { | 2297 | { |
2298 | /* session already owned by another client */ | ||
2299 | GNUNET_break (0); | 2298 | GNUNET_break (0); |
2300 | disconnect_client (session->scss.client); | 2299 | destroy_session (session); |
2301 | return; | 2300 | return; |
2302 | } | 2301 | } |
2303 | else | 2302 | GNUNET_SERVER_client_drop (other_session->scss.client); |
2304 | { | 2303 | other_session->scss.client = NULL; |
2305 | GNUNET_SERVER_client_drop (session->scss.client); | 2304 | break; |
2306 | session->scss.client = NULL; | ||
2307 | break; | ||
2308 | } | ||
2309 | } | 2305 | } |
2310 | other_session = other_session->next; | 2306 | other_session = other_session->next; |
2311 | } | 2307 | } |