mirror of
https://github.com/ElementsProject/lightning.git
synced 2024-11-19 09:54:16 +01:00
50f5eb34b4
Prior to this, lightningd would hand uninteresting peers back to connectd, which would then return it to lightningd if it sent a non-gossip msg, or if lightningd asked it to release the peer. Now connectd hands the peer to lightningd once we've done the init handshake, which hands it off to openingd. This is a deep structural change, so we do the minimum here and cleanup in the following patches. Lightningd: 1. Remove peer_nongossip handling from connect_control and peer_control. 2. Remove list of outstanding fundchannel command; it was only needed to find the race between us asking connectd to release the peer and it reconnecting. 3. We can no longer tell if the remote end has started trying to fund a channel (until it has succeeded): it's very transitory anyway so not worth fixing. 4. We now always have a struct peer, and allocate an uncommitted_channel for it, though it may never be used if neither end funds a channel. 5. We start funding on messages for openingd: we can get a funder_reply or a fundee, or an error in response to our request to fund a channel. so we handle all of them. 6. A new peer_start_openingd() is called after connectd hands us a peer. 7. json_fund_channel just looks through local peers; there are none hidden in connectd any more. 8. We sometimes start a new openingd just to send an error message. Openingd: 1. We always have information we need to accept them funding a channel (in the init message). 2. We have to listen for three fds: peer, gossip and master, so we opencode the poll. 3. We have an explicit message to start trying to fund a channel. 4. We can be told to send a message in our init message. Testing: 1. We don't handle some things gracefully yet, so two tests are disabled. 2. 'hand_back_peer .*: now local again' from connectd is no longer a message, openingd says 'Handed peer, entering loop' once its managing it. 3. peer['state'] used to be set to 'GOSSIPING' (otherwise this field doesn't exist; 'state' is now per-channel. It doesn't exist at all now. 4. Some tests now need to turn on IO logging in openingd, not connectd. 5. There's a gap between connecting on one node and having connectd on the peer hand over the connection to openingd. Our tests sometimes checked getpeers() on the peer, and didn't see anything, so line_graph needed updating. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
97 lines
2.7 KiB
C
97 lines
2.7 KiB
C
#ifndef LIGHTNING_LIGHTNINGD_PEER_CONTROL_H
|
|
#define LIGHTNING_LIGHTNINGD_PEER_CONTROL_H
|
|
#include "config.h"
|
|
#include <ccan/compiler/compiler.h>
|
|
#include <ccan/crypto/shachain/shachain.h>
|
|
#include <ccan/list/list.h>
|
|
#include <common/channel_config.h>
|
|
#include <common/htlc.h>
|
|
#include <common/json.h>
|
|
#include <common/wireaddr.h>
|
|
#include <lightningd/channel.h>
|
|
#include <lightningd/channel_state.h>
|
|
#include <stdbool.h>
|
|
#include <wallet/wallet.h>
|
|
#include <wire/peer_wire.h>
|
|
|
|
struct crypto_state;
|
|
|
|
struct peer {
|
|
/* Inside ld->peers. */
|
|
struct list_node list;
|
|
|
|
/* Master context */
|
|
struct lightningd *ld;
|
|
|
|
/* Database ID of the peer */
|
|
u64 dbid;
|
|
|
|
/* ID of peer */
|
|
struct pubkey id;
|
|
|
|
/* Our channels */
|
|
struct list_head channels;
|
|
|
|
/* Our (only) uncommitted channel, still opening. */
|
|
struct uncommitted_channel *uncommitted_channel;
|
|
|
|
/* History */
|
|
struct log_book *log_book;
|
|
|
|
/* Where we connected to, or it connected from. */
|
|
struct wireaddr_internal addr;
|
|
|
|
/* We keep a copy of their feature bits */
|
|
const u8 *local_features, *global_features;
|
|
|
|
/* If we open a channel our direction will be this */
|
|
u8 direction;
|
|
|
|
#if DEVELOPER
|
|
/* Swallow incoming HTLCs (for testing) */
|
|
bool ignore_htlcs;
|
|
#endif
|
|
};
|
|
|
|
struct peer *find_peer_by_dbid(struct lightningd *ld, u64 dbid);
|
|
|
|
struct peer *new_peer(struct lightningd *ld, u64 dbid,
|
|
const struct pubkey *id,
|
|
const struct wireaddr_internal *addr,
|
|
const u8 *gfeatures TAKES, const u8 *lfeatures TAKES);
|
|
|
|
/* Last one out deletes peer. Also removes from db. */
|
|
void maybe_delete_peer(struct peer *peer);
|
|
|
|
struct peer *peer_by_id(struct lightningd *ld, const struct pubkey *id);
|
|
struct peer *peer_from_json(struct lightningd *ld,
|
|
const char *buffer,
|
|
const jsmntok_t *peeridtok);
|
|
|
|
void peer_connected(struct lightningd *ld, const u8 *msg,
|
|
int peer_fd, int gossip_fd);
|
|
|
|
/* Could be configurable. */
|
|
#define OUR_CHANNEL_FLAGS CHANNEL_FLAGS_ANNOUNCE_CHANNEL
|
|
|
|
void channel_errmsg(struct channel *channel,
|
|
int peer_fd, int gossip_fd,
|
|
const struct crypto_state *cs,
|
|
const struct channel_id *channel_id,
|
|
const char *desc,
|
|
const u8 *err_for_them);
|
|
|
|
u8 *p2wpkh_for_keyidx(const tal_t *ctx, struct lightningd *ld, u64 keyidx);
|
|
|
|
/* We've loaded peers from database, set them going. */
|
|
void activate_peers(struct lightningd *ld);
|
|
|
|
void drop_to_chain(struct lightningd *ld, struct channel *channel, bool cooperative);
|
|
|
|
/* Get range of feerates to insist other side abide by for normal channels. */
|
|
u32 feerate_min(struct lightningd *ld);
|
|
u32 feerate_max(struct lightningd *ld);
|
|
|
|
void channel_watch_funding(struct lightningd *ld, struct channel *channel);
|
|
#endif /* LIGHTNING_LIGHTNINGD_PEER_CONTROL_H */
|