aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

openingd: pass back gossip fd on completion.

Browse Source 
For the moment, master still keeps a dup of gossip_fd, but that's the next
patch.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-06-24 16:20:23 +09:30
parent 2ff50107ac
commit ea52b0a8ff
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lightningd/opening/opening.c
View File

@@ -747,6 +747,7 @@ int main(int argc, char *argv[])
/* Write message and hand back the fd. */
wire_sync_write(REQ_FD, msg);
fdpass_send(REQ_FD, PEER_FD);
fdpass_send(REQ_FD, GOSSIP_FD);
status_trace("Sent %s with fd",
opening_wire_type_name(fromwire_peektype(msg)));
tal_free(state);

14
lightningd/peer_control.c
View File

@@ -1071,7 +1071,7 @@ static bool opening_funder_finished(struct subd *opening, const u8 *resp,
struct pubkey local_fundingkey;
struct crypto_state cs;
assert(tal_count(fds) == 1);
assert(tal_count(fds) == 2);
/* At this point, we care about peer */
fc->peer->channel_info = channel_info
@@ -1147,6 +1147,9 @@ static bool opening_funder_finished(struct subd *opening, const u8 *resp,
fc->peer->owner = NULL;
close(peer->gossip_client_fd);
peer->gossip_client_fd = fds[1];
if (!wire_sync_write(fc->peer->ld->hsm_fd, take(msg)))
fatal("Could not write to HSM: %s", strerror(errno));
@@ -1167,7 +1170,7 @@ static bool opening_fundee_finished(struct subd *opening,
struct crypto_state cs;
log_debug(peer->log, "Got opening_fundee_finish_response");
assert(tal_count(fds) == 1);
assert(tal_count(fds) == 2);
/* At this point, we care about peer */
peer->channel_info = channel_info = tal(peer, struct channel_info);
@@ -1205,6 +1208,9 @@ static bool opening_fundee_finished(struct subd *opening,
/* Unowned. */
peer->owner = NULL;
close(peer->gossip_client_fd);
peer->gossip_client_fd = fds[1];
/* On to normal operation! */
peer_start_channeld(peer, OPENINGD, &cs, fds[0], funding_signed);
@@ -1321,7 +1327,7 @@ void peer_fundee_open(struct peer *peer, const u8 *from_peer,
peer_fail_permanent(peer, (u8 *)take(err));
return;
}
subd_req(peer, peer->owner, take(msg), -1, 1,
subd_req(peer, peer->owner, take(msg), -1, 2,
opening_fundee_finished, peer);
}
@@ -1395,7 +1401,7 @@ static bool gossip_peer_released(struct subd *gossip,
15000, max_minimum_depth,
fc->change, fc->change_keyindex,
utxos, bip32_base);
subd_req(fc, opening, take(msg), -1, 1, opening_funder_finished, fc);
subd_req(fc, opening, take(msg), -1, 2, opening_funder_finished, fc);
return true;
}