mirror of
https://github.com/ElementsProject/lightning.git
synced 2025-01-18 13:25:43 +01:00
f7ebbb2ec5
Now "raw_payload" is always the complete string (including realm or length bytes at the front). This has several effects: 1. We can receive an decrypt an onion which is grossly malformed. 2. We can still hand this to the htlc_accepted hook. 3. We then fail it unless the htlc_accepted accepts it manually. 4. The createonion API now takes the raw payload, and does not know anything about "style". The only caveat is that the sphinx code needs to know the payload length: we have a call for that, which simply tells it to copy the entire onion (and treat us as the final node) if it's invalid. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
129 lines
4.0 KiB
Makefile
129 lines
4.0 KiB
Makefile
#! /usr/bin/make
|
|
|
|
# Designed to be run one level up
|
|
channeld-wrongdir:
|
|
$(MAKE) -C ../.. lightningd/channel-all
|
|
|
|
default: channeld-all
|
|
|
|
channeld-all: lightningd/lightning_channeld
|
|
|
|
LIGHTNINGD_CHANNEL_HEADERS_GEN := \
|
|
channeld/gen_full_channel_error_names.h \
|
|
channeld/gen_channel_wire.h
|
|
|
|
LIGHTNINGD_CHANNEL_HEADERS_NOGEN := \
|
|
channeld/channeld_htlc.h \
|
|
channeld/commit_tx.h \
|
|
channeld/full_channel.h \
|
|
channeld/full_channel_error.h
|
|
|
|
LIGHTNINGD_CHANNEL_HEADERS := $(LIGHTNINGD_CHANNEL_HEADERS_GEN) $(LIGHTNINGD_CHANNEL_HEADERS_NOGEN)
|
|
|
|
LIGHTNINGD_CHANNEL_SRC := channeld/channeld.c \
|
|
channeld/commit_tx.c \
|
|
channeld/full_channel.c \
|
|
channeld/gen_channel_wire.c
|
|
LIGHTNINGD_CHANNEL_OBJS := $(LIGHTNINGD_CHANNEL_SRC:.c=.o)
|
|
|
|
# Make sure these depend on everything.
|
|
ALL_OBJS += $(LIGHTNINGD_CHANNEL_OBJS)
|
|
ALL_PROGRAMS += lightningd/lightning_channeld
|
|
ALL_GEN_HEADERS += $(LIGHTNINGD_CHANNEL_HEADERS_GEN)
|
|
|
|
# Common source we use.
|
|
CHANNELD_COMMON_OBJS := \
|
|
common/amount.o \
|
|
common/base32.o \
|
|
common/bigsize.o \
|
|
common/bip32.o \
|
|
common/channel_config.o \
|
|
common/crypto_state.o \
|
|
common/crypto_sync.o \
|
|
common/cryptomsg.o \
|
|
common/daemon.o \
|
|
common/daemon_conn.o \
|
|
common/derive_basepoints.o \
|
|
common/dev_disconnect.o \
|
|
common/features.o \
|
|
common/gen_status_wire.o \
|
|
common/gen_peer_status_wire.o \
|
|
common/gossip_rcvd_filter.o \
|
|
common/gossip_store.o \
|
|
common/htlc_state.o \
|
|
common/htlc_trim.o \
|
|
common/htlc_tx.o \
|
|
common/htlc_wire.o \
|
|
common/initial_channel.o \
|
|
common/initial_commit_tx.o \
|
|
common/keyset.o \
|
|
common/key_derive.o \
|
|
common/memleak.o \
|
|
common/msg_queue.o \
|
|
common/node_id.o \
|
|
common/onion.o \
|
|
common/peer_billboard.o \
|
|
common/peer_failed.o \
|
|
common/per_peer_state.o \
|
|
common/permute_tx.o \
|
|
common/ping.o \
|
|
common/pseudorand.o \
|
|
common/read_peer_msg.o \
|
|
common/sphinx.o \
|
|
common/status.o \
|
|
common/status_wire.o \
|
|
common/subdaemon.o \
|
|
common/timeout.o \
|
|
common/type_to_string.o \
|
|
common/utils.o \
|
|
common/utxo.o \
|
|
common/version.o \
|
|
common/wire_error.o \
|
|
common/wireaddr.o \
|
|
gossipd/gen_gossip_peerd_wire.o \
|
|
hsmd/gen_hsm_wire.o \
|
|
lightningd/gossip_msg.o \
|
|
wire/fromwire.o \
|
|
wire/towire.o
|
|
|
|
LIGHTNINGD_CHANNEL_SRC_GEN := $(filter channeld/gen_%, $(LIGHTNINGD_CHANNEL_SRC))
|
|
|
|
LIGHTNINGD_CHANNEL_SRC_NOGEN := $(filter-out channeld/gen_%, $(LIGHTNINGD_CHANNEL_SRC))
|
|
|
|
# Control daemon uses this:
|
|
LIGHTNINGD_CHANNEL_CONTROL_HEADERS := $(LIGHTNINGD_CHANNEL_HEADERS_GEN)
|
|
LIGHTNINGD_CHANNEL_CONTROL_SRC := $(LIGHTNINGD_CHANNEL_SRC_GEN)
|
|
LIGHTNINGD_CHANNEL_CONTROL_OBJS := $(LIGHTNINGD_CHANNEL_CONTROL_SRC:.c=.o)
|
|
|
|
# Add to headers which any object might need.
|
|
LIGHTNINGD_HEADERS_GEN += $(LIGHTNINGD_CHANNEL_HEADERS_GEN)
|
|
LIGHTNINGD_HEADERS_NOGEN += $(LIGHTNINGD_CHANNEL_HEADERS_NOGEN)
|
|
|
|
channeld/gen_full_channel_error_names.h: channeld/full_channel_error.h ccan/ccan/cdump/tools/cdump-enumstr
|
|
ccan/ccan/cdump/tools/cdump-enumstr channeld/full_channel_error.h > $@
|
|
|
|
|
|
$(LIGHTNINGD_CHANNEL_OBJS): $(LIGHTNINGD_HEADERS) $(LIGHTNINGD_GOSSIP_CONTROL_HEADERS)
|
|
|
|
channeld/gen_channel_wire.h: $(WIRE_GEN) channeld/channel_wire.csv
|
|
$(WIRE_GEN) --page header $@ channel_wire_type < channeld/channel_wire.csv > $@
|
|
|
|
channeld/gen_channel_wire.c: $(WIRE_GEN) channeld/channel_wire.csv
|
|
$(WIRE_GEN) --page impl ${@:.c=.h} channel_wire_type < channeld/channel_wire.csv > $@
|
|
|
|
LIGHTNINGD_CHANNEL_OBJS := $(LIGHTNINGD_CHANNEL_SRC:.c=.o)
|
|
|
|
lightningd/lightning_channeld: $(LIGHTNINGD_CHANNEL_OBJS) $(WIRE_ONION_OBJS) $(CHANNELD_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(LIGHTNINGD_HSM_CLIENT_OBJS)
|
|
|
|
check-source: $(LIGHTNINGD_CHANNEL_SRC_NOGEN:%=check-src-include-order/%)
|
|
check-source-bolt: $(LIGHTNINGD_CHANNEL_SRC:%=bolt-check/%) $(LIGHTNINGD_CHANNEL_HEADERS:%=bolt-check/%)
|
|
|
|
check-whitespace: $(LIGHTNINGD_CHANNEL_SRC_NOGEN:%=check-whitespace/%) $(LIGHTNINGD_CHANNEL_HEADERS_NOGEN:%=check-whitespace/%)
|
|
|
|
clean: lightningd/channel-clean
|
|
|
|
lightningd/channel-clean:
|
|
$(RM) $(LIGHTNINGD_CHANNEL_OBJS) channeld/gen_*
|
|
|
|
-include channeld/test/Makefile
|