mirror of
https://github.com/ElementsProject/lightning.git
synced 2024-11-20 10:39:49 +01:00
fed5a117e7
structeq() is too dangerous: if a structure has padding, it can fail silently. The new ccan/structeq instead provides a macro to define foo_eq(), which does the right thing in case of padding (which none of our structures currently have anyway). Upgrade ccan, and use it everywhere. Except run-peer-wire.c, which is only testing code and can use raw memcmp(): valgrind will tell us if padding exists. Interestingly, we still declared short_channel_id_eq, even though we didn't define it any more! Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
42 lines
1.2 KiB
C
42 lines
1.2 KiB
C
#ifndef LIGHTNING_BITCOIN_SHORT_CHANNEL_ID_H
|
|
#define LIGHTNING_BITCOIN_SHORT_CHANNEL_ID_H
|
|
#include "config.h"
|
|
#include <ccan/short_types/short_types.h>
|
|
#include <ccan/structeq/structeq.h>
|
|
#include <ccan/tal/tal.h>
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
|
|
/* Short Channel ID is composed of 3 bytes for the block height, 3
|
|
* bytes of tx index in block and 2 bytes of output index. */
|
|
struct short_channel_id {
|
|
u64 u64;
|
|
};
|
|
/* Define short_channel_id_eq (no padding) */
|
|
STRUCTEQ_DEF(short_channel_id, 0, u64);
|
|
|
|
static inline u32 short_channel_id_blocknum(const struct short_channel_id *scid)
|
|
{
|
|
return scid->u64 >> 40;
|
|
}
|
|
|
|
static inline u32 short_channel_id_txnum(const struct short_channel_id *scid)
|
|
{
|
|
return (scid->u64 >> 16) & 0x00FFFFFF;
|
|
}
|
|
|
|
static inline u16 short_channel_id_outnum(const struct short_channel_id *scid)
|
|
{
|
|
return scid->u64 & 0xFFFF;
|
|
}
|
|
|
|
void mk_short_channel_id(struct short_channel_id *scid,
|
|
u32 blocknum, u32 txnum, u16 outnum);
|
|
|
|
bool short_channel_id_from_str(const char *str, size_t strlen,
|
|
struct short_channel_id *dst);
|
|
|
|
char *short_channel_id_to_str(const tal_t *ctx, const struct short_channel_id *scid);
|
|
|
|
#endif /* LIGHTNING_BITCOIN_SHORT_CHANNEL_ID_H */
|