lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tlv: make message sizes u8 not u16 

Suggested-By: @rustyrussell
pr-2587
lisa neigut 6 years ago
committed by Rusty Russell
parent
d6332997bd
commit
5aea65b463
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      tools/generate-wire.py

12
tools/generate-wire.py
View File

@ -832,28 +832,28 @@ struct {tlv_name} {{
tlv__type_impl_towire_fields = """\tif ({tlv_name}->{name}) {{ tlv__type_impl_towire_fields = """\tif ({tlv_name}->{name}) {{
\t\ttlv_msg = tal_arr(ctx, u8, 0); \t\ttlv_msg = tal_arr(ctx, u8, 0);
\t\ttowire_u16(p, {enum}); \t\ttowire_u8(p, {enum});
\t\ttowire_{tlv_name}_{name}(&tlv_msg, {tlv_name}->{name}); \t\ttowire_{tlv_name}_{name}(&tlv_msg, {tlv_name}->{name});
\t\tmsg_len = tal_count(tlv_msg); \t\tmsg_len = tal_count(tlv_msg);
\t\ttowire_u16(p, msg_len); \t\ttowire_u8(p, msg_len);
\t\ttowire_u8_array(p, tlv_msg, msg_len); \t\ttowire_u8_array(p, tlv_msg, msg_len);
\t}} \t}}
""" """
tlv__type_impl_towire_template = """static void towire__{tlv_name}(const tal_t *ctx, u8 **p, const struct {tlv_name} *{tlv_name}) {{ tlv__type_impl_towire_template = """static void towire__{tlv_name}(const tal_t *ctx, u8 **p, const struct {tlv_name} *{tlv_name}) {{
\tu16 msg_len; \tu8 msg_len;
\tu8 *tlv_msg; \tu8 *tlv_msg;
{fields}}} {fields}}}
""" """
tlv__type_impl_fromwire_template = """static bool fromwire__{tlv_name}(const tal_t *ctx, const u8 **p, size_t *plen, const u16 *len, struct {tlv_name} *{tlv_name}) {{ tlv__type_impl_fromwire_template = """static bool fromwire__{tlv_name}(const tal_t *ctx, const u8 **p, size_t *plen, const u16 *len, struct {tlv_name} *{tlv_name}) {{
\tu16 msg_type, msg_len; \tu8 msg_type, msg_len;
\tif (*plen < *len) \tif (*plen < *len)
\t\treturn false; \t\treturn false;
\twhile (*plen) {{ \twhile (*plen) {{
\t\tmsg_type = fromwire_u16(p, plen); \t\tmsg_type = fromwire_u8(p, plen);
\t\tmsg_len = fromwire_u16(p, plen); \t\tmsg_len = fromwire_u8(p, plen);
\t\tif (*plen < msg_len) {{ \t\tif (*plen < msg_len) {{
\t\t\tfromwire_fail(p, plen); \t\t\tfromwire_fail(p, plen);
\t\t\tbreak; \t\t\tbreak;

Write Preview
Loading…
Cancel
Save