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

tools/generate_wire.py: make varlen structs self-allocate.

Browse source 
If we tell it a struct is variable length, make fromwire() allocate
and return it off ctx.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2018-02-08 11:53:46 +10:30 • committed by Christian Decker
parent 6ca0c6e0ec
commit ad8dfaca1c
7 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/htlc_wire.c
View file

@ -78,16 +78,18 @@ void fromwire_fulfilled_htlc(const u8 **cursor, size_t *max,
fromwire_preimage(cursor, max, &fulfilled->payment_preimage); fromwire_preimage(cursor, max, &fulfilled->payment_preimage);
} }
void fromwire_failed_htlc(const tal_t *ctx, const u8 **cursor, size_t *max, struct failed_htlc *fromwire_failed_htlc(const tal_t *ctx, const u8 **cursor, size_t *max)
struct failed_htlc *failed)
{ {
u16 failreason_len; u16 failreason_len;
struct failed_htlc *failed = tal(ctx, struct failed_htlc);
failed->id = fromwire_u64(cursor, max); failed->id = fromwire_u64(cursor, max);
failed->malformed = fromwire_u16(cursor, max); failed->malformed = fromwire_u16(cursor, max);
failreason_len = fromwire_u16(cursor, max); failreason_len = fromwire_u16(cursor, max);
failed->failreason = tal_arr(ctx, u8, failreason_len); failed->failreason = tal_arr(failed, u8, failreason_len);
fromwire_u8_array(cursor, max, failed->failreason, failreason_len); fromwire_u8_array(cursor, max, failed->failreason, failreason_len);
return failed;
} }
enum htlc_state fromwire_htlc_state(const u8 **cursor, size_t *max) enum htlc_state fromwire_htlc_state(const u8 **cursor, size_t *max)

4
common/htlc_wire.h
View file

@ -47,8 +47,8 @@ void fromwire_added_htlc(const u8 **cursor, size_t *max,
struct added_htlc *added); struct added_htlc *added);
void fromwire_fulfilled_htlc(const u8 **cursor, size_t *max, void fromwire_fulfilled_htlc(const u8 **cursor, size_t *max,
struct fulfilled_htlc *fulfilled); struct fulfilled_htlc *fulfilled);
void fromwire_failed_htlc(const tal_t *ctx, const u8 **cursor, size_t *max, struct failed_htlc *fromwire_failed_htlc(const tal_t *ctx, const u8 **cursor,
struct failed_htlc *failed); size_t *max);
void fromwire_changed_htlc(const u8 **cursor, size_t *max, void fromwire_changed_htlc(const u8 **cursor, size_t *max,
struct changed_htlc *changed); struct changed_htlc *changed);
enum htlc_state fromwire_htlc_state(const u8 **cursor, size_t *max); enum htlc_state fromwire_htlc_state(const u8 **cursor, size_t *max);

7
common/utxo.c
View file

@ -20,21 +20,24 @@ void towire_utxo(u8 **pptr, const struct utxo *utxo)
} }
} }
void fromwire_utxo(const tal_t *ctx, const u8 **ptr, size_t *max, struct utxo *utxo) struct utxo *fromwire_utxo(const tal_t *ctx, const u8 **ptr, size_t *max)
{ {
struct utxo *utxo = tal(ctx, struct utxo);
fromwire_bitcoin_txid(ptr, max, &utxo->txid); fromwire_bitcoin_txid(ptr, max, &utxo->txid);
utxo->outnum = fromwire_u32(ptr, max); utxo->outnum = fromwire_u32(ptr, max);
utxo->amount = fromwire_u64(ptr, max); utxo->amount = fromwire_u64(ptr, max);
utxo->keyindex = fromwire_u32(ptr, max); utxo->keyindex = fromwire_u32(ptr, max);
utxo->is_p2sh = fromwire_bool(ptr, max); utxo->is_p2sh = fromwire_bool(ptr, max);
if (fromwire_bool(ptr, max)) { if (fromwire_bool(ptr, max)) {
utxo->close_info = tal(ctx, struct unilateral_close_info); utxo->close_info = tal(utxo, struct unilateral_close_info);
utxo->close_info->channel_id = fromwire_u64(ptr, max); utxo->close_info->channel_id = fromwire_u64(ptr, max);
fromwire_pubkey(ptr, max, &utxo->close_info->peer_id); fromwire_pubkey(ptr, max, &utxo->close_info->peer_id);
fromwire_pubkey(ptr, max, &utxo->close_info->commitment_point); fromwire_pubkey(ptr, max, &utxo->close_info->commitment_point);
} else { } else {
utxo->close_info = NULL; utxo->close_info = NULL;
} }
return utxo;
} }

2
common/utxo.h
View file

@ -29,7 +29,7 @@ struct utxo {
}; };
void towire_utxo(u8 **pptr, const struct utxo *utxo); void towire_utxo(u8 **pptr, const struct utxo *utxo);
void fromwire_utxo(const tal_t *ctx, const u8 **ptr, size_t *max, struct utxo *utxo); struct utxo *fromwire_utxo(const tal_t *ctx, const u8 **ptr, size_t *max);
/* build_utxos/funding_tx use array of pointers, but marshall code /* build_utxos/funding_tx use array of pointers, but marshall code
* wants arr of structs */ * wants arr of structs */

15
lightningd/gossip_msg.c
View file

@ -2,31 +2,36 @@
#include <lightningd/gossip_msg.h> #include <lightningd/gossip_msg.h>
#include <wire/wire.h> #include <wire/wire.h>
void fromwire_gossip_getnodes_entry(const tal_t *ctx, const u8 **pptr, size_t *max, struct gossip_getnodes_entry *entry) struct gossip_getnodes_entry *fromwire_gossip_getnodes_entry(const tal_t *ctx, const u8 **pptr, size_t *max)
{ {
u8 numaddresses, i; u8 numaddresses, i;
struct gossip_getnodes_entry *entry;
entry = tal(ctx, struct gossip_getnodes_entry);
fromwire_pubkey(pptr, max, &entry->nodeid); fromwire_pubkey(pptr, max, &entry->nodeid);
entry->last_timestamp = fromwire_u64(pptr, max); entry->last_timestamp = fromwire_u64(pptr, max);
if (entry->last_timestamp < 0) { if (entry->last_timestamp < 0) {
entry->addresses = NULL; entry->addresses = NULL;
entry->alias = NULL; entry->alias = NULL;
return; return entry;
} }
numaddresses = fromwire_u8(pptr, max); numaddresses = fromwire_u8(pptr, max);
entry->addresses = tal_arr(ctx, struct wireaddr, numaddresses); entry->addresses = tal_arr(entry, struct wireaddr, numaddresses);
for (i=0; i<numaddresses; i++) { for (i=0; i<numaddresses; i++) {
/* Gossipd doesn't hand us addresses we can't understand. */ /* Gossipd doesn't hand us addresses we can't understand. */
if (!fromwire_wireaddr(pptr, max, entry->addresses)) { if (!fromwire_wireaddr(pptr, max, entry->addresses)) {
fromwire_fail(pptr, max); fromwire_fail(pptr, max);
return; return NULL;
} }
} }
entry->alias = tal_arr(ctx, u8, fromwire_u8(pptr, max)); entry->alias = tal_arr(entry, u8, fromwire_u8(pptr, max));
fromwire(pptr, max, entry->alias, tal_len(entry->alias)); fromwire(pptr, max, entry->alias, tal_len(entry->alias));
fromwire(pptr, max, entry->color, sizeof(entry->color)); fromwire(pptr, max, entry->color, sizeof(entry->color));
return entry;
} }
void towire_gossip_getnodes_entry(u8 **pptr, const struct gossip_getnodes_entry *entry) void towire_gossip_getnodes_entry(u8 **pptr, const struct gossip_getnodes_entry *entry)
{ {
u8 i, numaddresses = tal_count(entry->addresses); u8 i, numaddresses = tal_count(entry->addresses);

5
lightningd/gossip_msg.h
View file

@ -25,9 +25,8 @@ struct gossip_getchannels_entry {
u32 fee_per_millionth; u32 fee_per_millionth;
}; };
void fromwire_gossip_getnodes_entry(const tal_t *ctx, const u8 **pptr, struct gossip_getnodes_entry *
size_t *max, fromwire_gossip_getnodes_entry(const tal_t *ctx, const u8 **pptr, size_t *max);
struct gossip_getnodes_entry *entry);
void towire_gossip_getnodes_entry(u8 **pptr, void towire_gossip_getnodes_entry(u8 **pptr,
const struct gossip_getnodes_entry *entry); const struct gossip_getnodes_entry *entry);

19
tools/generate-wire.py
View file

@ -280,10 +280,12 @@ class Message(object):
if f.fieldtype.is_assignable(): if f.fieldtype.is_assignable():
subcalls.append('\t\t({})[i] = fromwire_{}(&cursor, plen);' subcalls.append('\t\t({})[i] = fromwire_{}(&cursor, plen);'
.format(name, basetype)) .format(name, basetype))
elif basetype in varlen_structs:
subcalls.append('\t\t{}[i] = fromwire_{}(ctx, &cursor, plen);'
.format(f.name, basetype))
else: else:
ctx = "ctx, " if basetype in varlen_structs else "" subcalls.append('\t\tfromwire_{}(&cursor, plen, {} + i);'
subcalls.append('\t\tfromwire_{}({}&cursor, plen, {} + i);' .format(basetype, name))
.format(basetype, ctx, name))
def print_fromwire(self,is_header): def print_fromwire(self,is_header):
ctx_arg = 'const tal_t *ctx, ' if self.has_variable_fields else '' ctx_arg = 'const tal_t *ctx, ' if self.has_variable_fields else ''
@ -297,6 +299,8 @@ class Message(object):
args.append(', {} {}[{}]'.format(f.fieldtype.name, f.name, f.num_elems)) args.append(', {} {}[{}]'.format(f.fieldtype.name, f.name, f.num_elems))
elif f.is_variable_size(): elif f.is_variable_size():
args.append(', {} **{}'.format(f.fieldtype.name, f.name)) args.append(', {} **{}'.format(f.fieldtype.name, f.name))
elif f.basetype() in varlen_structs:
args.append(', {} **{}'.format(f.fieldtype.name, f.name))
else: else:
args.append(', {} *{}'.format(f.fieldtype.name, f.name)) args.append(', {} *{}'.format(f.fieldtype.name, f.name))
@ -331,11 +335,12 @@ class Message(object):
else: else:
subcalls.append('\t*{} = fromwire_{}(&cursor, plen);' subcalls.append('\t*{} = fromwire_{}(&cursor, plen);'
.format(f.name, basetype)) .format(f.name, basetype))
elif basetype in varlen_structs:
subcalls.append('\t*{} = fromwire_{}(ctx, &cursor, plen);'
.format(f.name, basetype))
else: else:
subcalls.append("\t//4th case {name}".format(name=f.name)) subcalls.append('\tfromwire_{}(&cursor, plen, {});'
ctx = "ctx, " if basetype in varlen_structs else "" .format(basetype, f.name))
subcalls.append('\tfromwire_{}({}&cursor, plen, {});'
.format(basetype, ctx, f.name))
return template.format( return template.format(
name=self.name, name=self.name,