mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-23 15:00:34 +01:00
Code Issues Projects Releases Wiki Activity

lightningd/channel.c: make callbacks clearly generic

Browse source 
Passing through 'struct peer *' was a layering violation.

Reported-by: Christian Decker <decker.christian@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-04-01 21:27:07 +10:30
parent ada1eb5106
commit f83c04fdbe
4 changed files with 64 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
lightningd/channel.c
View file

@ -620,21 +620,18 @@ static void htlc_incstate(struct channel *channel,
} }
static void check_lockedin(const struct htlc *h, static void check_lockedin(const struct htlc *h,
struct peer *peer, void (*oursfail)(const struct htlc *, void *),
void (*oursfail)(struct peer *peer, void (*theirslocked)(const struct htlc *, void *),
const struct htlc *htlc), void (*theirsfulfilled)(const struct htlc *, void *),
void (*theirslocked)(struct peer *peer, void *cbarg)
const struct htlc *htlc),
void (*theirsfulfilled)(struct peer *peer,
const struct htlc *htlc))
{ {
/* If it was fulfilled, we handled it immediately. */ /* If it was fulfilled, we handled it immediately. */
if (h->state == RCVD_REMOVE_ACK_REVOCATION && !h->r) if (h->state == RCVD_REMOVE_ACK_REVOCATION && !h->r)
oursfail(peer, h); oursfail(h, cbarg);
else if (h->state == RCVD_ADD_ACK_REVOCATION) else if (h->state == RCVD_ADD_ACK_REVOCATION)
theirslocked(peer, h); theirslocked(h, cbarg);
else if (h->state == RCVD_REMOVE_ACK_COMMIT && h->r) else if (h->state == RCVD_REMOVE_ACK_COMMIT && h->r)
theirsfulfilled(peer, h); theirsfulfilled(h, cbarg);
} }
/* FIXME: Commit to storage when this happens. */ /* FIXME: Commit to storage when this happens. */
@ -642,13 +639,10 @@ static bool change_htlcs(struct channel *channel,
enum side sidechanged, enum side sidechanged,
const enum htlc_state *htlc_states, const enum htlc_state *htlc_states,
size_t n_hstates, size_t n_hstates,
struct peer *peer, void (*oursfail)(const struct htlc *, void *),
void (*oursfail)(struct peer *peer, void (*theirslocked)(const struct htlc *, void *),
const struct htlc *htlc), void (*theirsfulfilled)(const struct htlc *, void *),
void (*theirslocked)(struct peer *peer, void *cbarg)
const struct htlc *htlc),
void (*theirsfulfilled)(struct peer *peer,
const struct htlc *htlc))
{ {
struct htlc_map_iter it; struct htlc_map_iter it;
struct htlc *h; struct htlc *h;
@ -661,10 +655,11 @@ static bool change_htlcs(struct channel *channel,
for (i = 0; i < n_hstates; i++) { for (i = 0; i < n_hstates; i++) {
if (h->state == htlc_states[i]) { if (h->state == htlc_states[i]) {
htlc_incstate(channel, h, sidechanged); htlc_incstate(channel, h, sidechanged);
check_lockedin(h, peer, check_lockedin(h,
oursfail, oursfail,
theirslocked, theirslocked,
theirsfulfilled); theirsfulfilled,
cbarg);
changed = true; changed = true;
} }
} }
@ -684,12 +679,12 @@ bool channel_sent_commit(struct channel *channel)
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
} }
bool channel_rcvd_revoke_and_ack(struct channel *channel, bool channel_rcvd_revoke_and_ack_(struct channel *channel,
struct peer *peer, void (*oursfail)(const struct htlc *htlc,
void (*oursfail)(struct peer *peer, void *cbarg),
const struct htlc *htlc), void (*theirslocked)(const struct htlc *htlc,
void (*theirslocked)(struct peer *peer, void *cbarg),
const struct htlc *htlc)) void *cbarg)
{ {
const enum htlc_state states[] = { SENT_ADD_COMMIT, const enum htlc_state states[] = { SENT_ADD_COMMIT,
SENT_REMOVE_ACK_COMMIT, SENT_REMOVE_ACK_COMMIT,
@ -698,14 +693,14 @@ bool channel_rcvd_revoke_and_ack(struct channel *channel,
status_trace("received revoke_and_ack"); status_trace("received revoke_and_ack");
return change_htlcs(channel, LOCAL, states, ARRAY_SIZE(states), return change_htlcs(channel, LOCAL, states, ARRAY_SIZE(states),
peer, oursfail, theirslocked, NULL); oursfail, theirslocked, NULL, cbarg);
} }
/* FIXME: We can actually merge these two... */ /* FIXME: We can actually merge these two... */
bool channel_rcvd_commit(struct channel *channel, bool channel_rcvd_commit_(struct channel *channel,
struct peer *peer, void (*theirsfulfilled)(const struct htlc *htlc,
void (*theirsfulfilled)(struct peer *peer, void *cbarg),
const struct htlc *htlc)) void *cbarg)
{ {
const enum htlc_state states[] = { RCVD_ADD_REVOCATION, const enum htlc_state states[] = { RCVD_ADD_REVOCATION,
RCVD_REMOVE_HTLC, RCVD_REMOVE_HTLC,
@ -714,7 +709,7 @@ bool channel_rcvd_commit(struct channel *channel,
status_trace("received commit"); status_trace("received commit");
return change_htlcs(channel, LOCAL, states, ARRAY_SIZE(states), return change_htlcs(channel, LOCAL, states, ARRAY_SIZE(states),
peer, NULL, NULL, theirsfulfilled); NULL, NULL, theirsfulfilled, cbarg);
} }
bool channel_sent_revoke_and_ack(struct channel *channel) bool channel_sent_revoke_and_ack(struct channel *channel)

46
lightningd/channel.h
View file

@ -5,12 +5,12 @@
#include <bitcoin/shadouble.h> #include <bitcoin/shadouble.h>
#include <ccan/short_types/short_types.h> #include <ccan/short_types/short_types.h>
#include <ccan/tal/tal.h> #include <ccan/tal/tal.h>
#include <ccan/typesafe_cb/typesafe_cb.h>
#include <daemon/htlc.h> #include <daemon/htlc.h>
#include <lightningd/channel_config.h> #include <lightningd/channel_config.h>
#include <lightningd/derive_basepoints.h> #include <lightningd/derive_basepoints.h>
#include <stdbool.h> #include <stdbool.h>
struct peer;
struct signature; struct signature;
/* View from each side */ /* View from each side */
@ -331,34 +331,54 @@ bool channel_sent_commit(struct channel *channel);
/** /**
* channel_rcvd_revoke_and_ack: accept ack on remote committed changes. * channel_rcvd_revoke_and_ack: accept ack on remote committed changes.
* @channel: the channel * @channel: the channel
* @peer: argument to pass through to @ourhtlcfail & @theirhtlclocked
* @oursfail: callback for any unfilfilled htlcs which are now fully removed. * @oursfail: callback for any unfilfilled htlcs which are now fully removed.
* @theirslocked: callback for any new htlcs which are now fully committed. * @theirslocked: callback for any new htlcs which are now fully committed.
* @cbarg: argument to pass through to @ourhtlcfail & @theirhtlclocked
* *
* This is where we commit to pending changes we've added; returns true if * This is where we commit to pending changes we've added; returns true if
* anything changed. * anything changed.
*/ */
bool channel_rcvd_revoke_and_ack(struct channel *channel, #define channel_rcvd_revoke_and_ack(channel, oursfail, theirslocked, cbarg) \
struct peer *peer, channel_rcvd_revoke_and_ack_((channel), \
void (*oursfail)(struct peer *peer, typesafe_cb_preargs(void, void *, \
const struct htlc *htlc), (oursfail), \
void (*theirslocked)(struct peer *peer, (cbarg), \
const struct htlc *htlc)); const struct htlc *), \
typesafe_cb_preargs(void, void *, \
(theirslocked), \
(cbarg), \
const struct htlc *), \
(cbarg))
bool channel_rcvd_revoke_and_ack_(struct channel *channel,
void (*oursfail)(const struct htlc *htlc,
void *cbarg),
void (*theirslocked)(const struct htlc *htlc,
void *cbarg),
void *cbarg);
/** /**
* channel_rcvd_commit: commit all local outstanding changes. * channel_rcvd_commit: commit all local outstanding changes.
* @channel: the channel * @channel: the channel
* @peer: argument to pass through to @theirsfulfilled
* @theirsfulfilled: they are irrevocably committed to removal of htlc. * @theirsfulfilled: they are irrevocably committed to removal of htlc.
* @cbarg: argument to pass through to @theirsfulfilled
* *
* This is where we commit to pending changes we've added; returns true if * This is where we commit to pending changes we've added; returns true if
* anything changed. @theirsfulfilled is called for any HTLC we fulfilled * anything changed. @theirsfulfilled is called for any HTLC we fulfilled
* which they are irrevocably committed to, and is in our current commitment. * which they are irrevocably committed to, and is in our current commitment.
*/ */
bool channel_rcvd_commit(struct channel *channel, #define channel_rcvd_commit(channel, theirsfulfilled, cbarg) \
struct peer *peer, channel_rcvd_commit_((channel), \
void (*theirsfulfilled)(struct peer *peer, typesafe_cb_preargs(void, void *, \
const struct htlc *htlc)); (theirsfulfilled), \
(cbarg), \
const struct htlc *), \
(cbarg))
bool channel_rcvd_commit_(struct channel *channel,
void (*theirsfulfilled)(const struct htlc *htlc,
void *cbarg),
void *cbarg);
/** /**
* channel_sent_revoke_and_ack: sent ack on local committed changes. * channel_sent_revoke_and_ack: sent ack on local committed changes.

2
lightningd/channel/channel.c
View file

@ -370,7 +370,7 @@ static void handle_peer_commit_sig(struct peer *peer, const u8 *msg)
size_t i; size_t i;
/* FIXME: Handle theirsfulfilled! */ /* FIXME: Handle theirsfulfilled! */
if (!channel_rcvd_commit(peer->channel, peer, NULL)) { if (!channel_rcvd_commit(peer->channel, NULL, peer)) {
/* BOLT #2: /* BOLT #2:
* *
* A node MUST NOT send a `commitment_signed` message which * A node MUST NOT send a `commitment_signed` message which

8
lightningd/test/run-channel.c
View file

@ -81,7 +81,7 @@ static u64 feerates[] = {
9651936 9651936
}; };
static void do_nothing(struct peer *peer, const struct htlc *htlc) static void do_nothing(const struct htlc *htlc, void *unused)
{ {
} }
@ -158,7 +158,7 @@ static const struct htlc **include_htlcs(struct channel *channel, enum side side
channel_rcvd_commit(channel, NULL, NULL); channel_rcvd_commit(channel, NULL, NULL);
channel_sent_revoke_and_ack(channel); channel_sent_revoke_and_ack(channel);
channel_sent_commit(channel); channel_sent_commit(channel);
channel_rcvd_revoke_and_ack(channel, NULL, NULL, do_nothing); channel_rcvd_revoke_and_ack(channel, NULL, do_nothing, NULL);
return htlcs; return htlcs;
} }
@ -255,12 +255,12 @@ static void send_and_fulfill_htlc(struct channel *channel,
channel_rcvd_commit(channel, NULL, NULL); channel_rcvd_commit(channel, NULL, NULL);
channel_sent_revoke_and_ack(channel); channel_sent_revoke_and_ack(channel);
channel_sent_commit(channel); channel_sent_commit(channel);
channel_rcvd_revoke_and_ack(channel, NULL, NULL, do_nothing); channel_rcvd_revoke_and_ack(channel, NULL, do_nothing, NULL);
assert(channel_fulfill_htlc(channel, LOCAL, 1337, &r) assert(channel_fulfill_htlc(channel, LOCAL, 1337, &r)
== CHANNEL_ERR_REMOVE_OK); == CHANNEL_ERR_REMOVE_OK);
channel_sent_commit(channel); channel_sent_commit(channel);
channel_rcvd_revoke_and_ack(channel, NULL, NULL, NULL); channel_rcvd_revoke_and_ack(channel, NULL, NULL, NULL);
channel_rcvd_commit(channel, NULL, do_nothing); channel_rcvd_commit(channel, do_nothing, NULL);
channel_sent_revoke_and_ack(channel); channel_sent_revoke_and_ack(channel);
assert(channel_get_htlc(channel, sender, 1337)->state assert(channel_get_htlc(channel, sender, 1337)->state
== SENT_REMOVE_ACK_REVOCATION); == SENT_REMOVE_ACK_REVOCATION);