aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-23 17:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

wire: add bool routines.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-01-04 14:09:21 +10:30
parent 937a62100f
commit f50af430e1
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/generate-wire.py
View File

@@ -14,7 +14,7 @@ class FieldType(object):
self.tsize = FieldType._typesize(name) self.tsize = FieldType._typesize(name)
def is_assignable(self): def is_assignable(self):
return self.name == 'u8' or self.name == 'u16' or self.name == 'u32' or self.name == 'u64' return self.name == 'u8' or self.name == 'u16' or self.name == 'u32' or self.name == 'u64' or self.name == 'bool'
# Returns typename and base size # Returns typename and base size
@staticmethod @staticmethod
@@ -39,6 +39,8 @@ class FieldType(object):
return 2 return 2
elif typename == 'u8': elif typename == 'u8':
return 1 return 1
elif typename == 'bool':
return 1
else: else:
raise ValueError('Unknown typename {}'.format(typename)) raise ValueError('Unknown typename {}'.format(typename))

11
wire/fromwire.c
View File

@@ -76,6 +76,17 @@ u64 fromwire_u64(const u8 **cursor, size_t *max)
return be64_to_cpu(ret); return be64_to_cpu(ret);
} }
bool fromwire_bool(const u8 **cursor, size_t *max)
{
u8 ret;
if (!fromwire(cursor, max, &ret, sizeof(ret)))
return false;
if (ret != 0 && ret != 1)
fail_pull(cursor, max);
return ret;
}
void fromwire_pubkey(const u8 **cursor, size_t *max, struct pubkey *pubkey) void fromwire_pubkey(const u8 **cursor, size_t *max, struct pubkey *pubkey)
{ {
u8 der[PUBKEY_DER_LEN]; u8 der[PUBKEY_DER_LEN];

6
wire/towire.c
View File

@@ -35,6 +35,12 @@ void towire_u64(u8 **pptr, u64 v)
towire(pptr, &l, sizeof(l)); towire(pptr, &l, sizeof(l));
} }
void towire_bool(u8 **pptr, bool v)
{
u8 val = !!v;
towire(pptr, &val, sizeof(val));
}
void towire_pubkey(u8 **pptr, const struct pubkey *pubkey) void towire_pubkey(u8 **pptr, const struct pubkey *pubkey)
{ {
u8 output[PUBKEY_DER_LEN]; u8 output[PUBKEY_DER_LEN];

2
wire/wire.h
View File

@@ -32,6 +32,7 @@ void towire_u16(u8 **pptr, u16 v);
void towire_u32(u8 **pptr, u32 v); void towire_u32(u8 **pptr, u32 v);
void towire_u64(u8 **pptr, u64 v); void towire_u64(u8 **pptr, u64 v);
void towire_pad(u8 **pptr, size_t num); void towire_pad(u8 **pptr, size_t num);
void towire_bool(u8 **pptr, bool v);
void towire_u8_array(u8 **pptr, const u8 *arr, size_t num); void towire_u8_array(u8 **pptr, const u8 *arr, size_t num);
void towire_signature_array(u8 **pptr, const struct signature *arr, size_t num); void towire_signature_array(u8 **pptr, const struct signature *arr, size_t num);
@@ -42,6 +43,7 @@ u8 fromwire_u8(const u8 **cursor, size_t *max);
u16 fromwire_u16(const u8 **cursor, size_t *max); u16 fromwire_u16(const u8 **cursor, size_t *max);
u32 fromwire_u32(const u8 **cursor, size_t *max); u32 fromwire_u32(const u8 **cursor, size_t *max);
u64 fromwire_u64(const u8 **cursor, size_t *max); u64 fromwire_u64(const u8 **cursor, size_t *max);
bool fromwire_bool(const u8 **cursor, size_t *max);
void fromwire_pubkey(const u8 **cursor, size_t *max, struct pubkey *pubkey); void fromwire_pubkey(const u8 **cursor, size_t *max, struct pubkey *pubkey);
void fromwire_signature(const u8 **cursor, size_t *max, void fromwire_signature(const u8 **cursor, size_t *max,
struct signature *signature); struct signature *signature);