|
|
|
|
#! /usr/bin/make
|
|
|
|
|
|
|
|
|
|
# Designed to be run one level up
|
|
|
|
|
gossipd-wrongdir:
|
|
|
|
|
$(MAKE) -C .. gossipd-all
|
|
|
|
|
|
|
|
|
|
default: gossipd-all
|
|
|
|
|
|
|
|
|
|
# Control daemon uses this:
|
|
|
|
|
LIGHTNINGD_GOSSIP_CONTROL_HEADERS := gossipd/gen_gossip_wire.h
|
|
|
|
|
LIGHTNINGD_GOSSIP_CONTROL_SRC := gossipd/gen_gossip_wire.c
|
|
|
|
|
LIGHTNINGD_GOSSIP_CONTROL_OBJS := $(LIGHTNINGD_GOSSIP_CONTROL_SRC:.c=.o)
|
|
|
|
|
|
|
|
|
|
# gossipd needs these:
|
|
|
|
|
LIGHTNINGD_GOSSIP_HEADERS := gossipd/gen_gossip_wire.h \
|
gossipd: rewrite to do the handshake internally.
Now the flow is much simpler from a lightningd POV:
1. If we want to connect to a peer, just send gossipd `gossipctl_reach_peer`.
2. Every new peer, gossipd hands up to lightningd, with global/local features
and the peer fd and a gossip fd using `gossip_peer_connected`
3. If lightningd doesn't want it, it just hands the peerfd and global/local
features back to gossipd using `gossipctl_handle_peer`
4. If a peer sends a non-gossip msg (eg `open_channel`) the gossipd sends
it up using `gossip_peer_nongossip`.
5. If lightningd wants to fund a channel, it simply calls `release_channel`.
Notes:
* There's no more "unique_id": we use the peer id.
* For the moment, we don't ask gossipd when we're told to list peers, so
connected peers without a channel don't appear in the JSON getpeers API.
* We add a `gossipctl_peer_addrhint` for the moment, so you can connect to
a specific ip/port, but using other sources is a TODO.
* We now (correctly) only give up on reaching a peer after we exchange init
messages, which changes the test_disconnect case.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
7 years ago
|
|
|
gossipd/handshake.h \
|
|
|
|
|
gossipd/routing.h \
|
|
|
|
|
gossipd/broadcast.h
|
|
|
|
|
LIGHTNINGD_GOSSIP_SRC := gossipd/gossip.c \
|
|
|
|
|
$(LIGHTNINGD_GOSSIP_HEADERS:.h=.c)
|
|
|
|
|
LIGHTNINGD_GOSSIP_OBJS := $(LIGHTNINGD_GOSSIP_SRC:.c=.o)
|
|
|
|
|
|
|
|
|
|
# Make sure these depend on everything.
|
|
|
|
|
ALL_OBJS += $(LIGHTNINGD_GOSSIP_OBJS)
|
|
|
|
|
ALL_PROGRAMS += lightningd/lightning_gossipd
|
|
|
|
|
ALL_GEN_HEADERS += $(LIGHTNINGD_GOSSIP_CONTROL_HEADERS)
|
|
|
|
|
|
|
|
|
|
# For checking
|
|
|
|
|
LIGHTNINGD_GOSSIP_ALLSRC_NOGEN := $(filter-out gossipd/gen_%, $(LIGHTNINGD_GOSSIP_CLIENT_SRC) $(LIGHTNINGD_GOSSIP_SRC))
|
|
|
|
|
LIGHTNINGD_GOSSIP_ALLHEADERS_NOGEN := $(filter-out gossipd/gen_%, $(LIGHTNINGD_GOSSIP_CLIENT_HEADERS) $(LIGHTNINGD_GOSSIP_HEADERS))
|
|
|
|
|
|
|
|
|
|
# Add to headers which any object might need.
|
|
|
|
|
LIGHTNINGD_HEADERS_GEN += $(LIGHTNINGD_GOSSIP_HEADERS)
|
|
|
|
|
|
|
|
|
|
# Common source we use.
|
|
|
|
|
GOSSIPD_COMMON_OBJS := \
|
|
|
|
|
common/bip32.o \
|
|
|
|
|
common/crypto_state.o \
|
|
|
|
|
common/crypto_sync.o \
|
|
|
|
|
common/cryptomsg.o \
|
|
|
|
|
common/daemon_conn.o \
|
|
|
|
|
common/dev_disconnect.o \
|
|
|
|
|
common/io_debug.o \
|
|
|
|
|
common/msg_queue.o \
|
|
|
|
|
common/ping.o \
|
|
|
|
|
common/pseudorand.o \
|
|
|
|
|
common/status.o \
|
|
|
|
|
common/subdaemon.o \
|
|
|
|
|
common/timeout.o \
|
|
|
|
|
common/type_to_string.o \
|
|
|
|
|
common/utils.o \
|
|
|
|
|
common/utxo.o \
|
|
|
|
|
common/version.o \
|
|
|
|
|
common/wireaddr.o \
|
gossipd: rewrite to do the handshake internally.
Now the flow is much simpler from a lightningd POV:
1. If we want to connect to a peer, just send gossipd `gossipctl_reach_peer`.
2. Every new peer, gossipd hands up to lightningd, with global/local features
and the peer fd and a gossip fd using `gossip_peer_connected`
3. If lightningd doesn't want it, it just hands the peerfd and global/local
features back to gossipd using `gossipctl_handle_peer`
4. If a peer sends a non-gossip msg (eg `open_channel`) the gossipd sends
it up using `gossip_peer_nongossip`.
5. If lightningd wants to fund a channel, it simply calls `release_channel`.
Notes:
* There's no more "unique_id": we use the peer id.
* For the moment, we don't ask gossipd when we're told to list peers, so
connected peers without a channel don't appear in the JSON getpeers API.
* We add a `gossipctl_peer_addrhint` for the moment, so you can connect to
a specific ip/port, but using other sources is a TODO.
* We now (correctly) only give up on reaching a peer after we exchange init
messages, which changes the test_disconnect case.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
7 years ago
|
|
|
common/wire_error.o \
|
|
|
|
|
hsmd/client.o \
|
|
|
|
|
hsmd/gen_hsm_client_wire.o \
|
|
|
|
|
lightningd/gossip_msg.o
|
|
|
|
|
|
|
|
|
|
$(LIGHTNINGD_GOSSIP_OBJS) $(LIGHTNINGD_GOSSIP_CLIENT_OBJS): $(LIGHTNINGD_HEADERS) $(LIGHTNINGD_GOSSIP_HEADERS)
|
|
|
|
|
|
|
|
|
|
$(LIGHTNINGD_GOSSIP_CONTROL_OBJS) : $(LIGHTNINGD_GOSSIP_CONTROL_HEADERS)
|
|
|
|
|
|
|
|
|
|
gossipd-all: lightningd/lightning_gossipd $(LIGHTNINGD_GOSSIP_CLIENT_OBJS)
|
|
|
|
|
|
|
|
|
|
lightningd/lightning_gossipd: $(LIGHTNINGD_GOSSIP_OBJS) $(GOSSIPD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS)
|
|
|
|
|
|
|
|
|
|
gossipd/gen_gossip_wire.h: $(WIRE_GEN) gossipd/gossip_wire.csv
|
|
|
|
|
$(WIRE_GEN) --header $@ gossip_wire_type < gossipd/gossip_wire.csv > $@
|
|
|
|
|
|
|
|
|
|
gossipd/gen_gossip_wire.c: $(WIRE_GEN) gossipd/gossip_wire.csv
|
|
|
|
|
$(WIRE_GEN) ${@:.c=.h} gossip_wire_type < gossipd/gossip_wire.csv > $@
|
|
|
|
|
|
|
|
|
|
check-source: $(LIGHTNINGD_GOSSIP_ALLSRC_NOGEN:%=check-src-include-order/%) $(LIGHTNINGD_GOSSIP_ALLHEADERS_NOGEN:%=check-hdr-include-order/%)
|
|
|
|
|
check-source-bolt: $(LIGHTNINGD_GOSSIP_SRC:%=bolt-check/%) $(LIGHTNINGD_GOSSIP_HEADERS:%=bolt-check/%)
|
|
|
|
|
check-whitespace: $(LIGHTNINGD_GOSSIP_ALLSRC_NOGEN:%=check-whitespace/%) $(LIGHTNINGD_GOSSIP_ALLHEADERS_NOGEN:%=check-whitespace/%)
|
|
|
|
|
|
|
|
|
|
clean: gossipd-clean
|
|
|
|
|
|
|
|
|
|
gossipd-clean:
|
|
|
|
|
$(RM) $(LIGHTNINGD_GOSSIP_OBJS) gossipd/gen_*
|
|
|
|
|
|
|
|
|
|
-include gossipd/test/Makefile
|
