From 710e9e8961cf5039b425e66d2042942b7e4af0c8 Mon Sep 17 00:00:00 2001 From: Determinant Date: Fri, 28 Jun 2019 15:37:22 -0400 Subject: clean up code --- include/salticidae/netaddr.h | 6 +++--- include/salticidae/network.h | 3 ++- include/salticidae/stream.h | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/salticidae/netaddr.h b/include/salticidae/netaddr.h index e4e8c6c..7d04d43 100644 --- a/include/salticidae/netaddr.h +++ b/include/salticidae/netaddr.h @@ -138,9 +138,9 @@ extern "C" { netaddr_t *netaddr_new(); void netaddr_free(const netaddr_t *self); -netaddr_t *netaddr_new_from_ip_port(uint32_t ip, uint16_t port); -netaddr_t *netaddr_new_from_sip_port(const char *ip, uint16_t port); -netaddr_t *netaddr_new_from_sipport(const char *ip_port_addr); +netaddr_t *netaddr_new_from_ip_port(uint32_t ip, uint16_t port, SalticidaeCError *err); +netaddr_t *netaddr_new_from_sip_port(const char *ip, uint16_t port, SalticidaeCError *err); +netaddr_t *netaddr_new_from_sipport(const char *ip_port_addr, SalticidaeCError *err); netaddr_t *netaddr_copy(const netaddr_t *self); bool netaddr_is_eq(const netaddr_t *a, const netaddr_t *b); bool netaddr_is_null(const netaddr_t *self); diff --git a/include/salticidae/network.h b/include/salticidae/network.h index 092c969..f8b3353 100644 --- a/include/salticidae/network.h +++ b/include/salticidae/network.h @@ -1186,7 +1186,8 @@ typedef enum msgnetwork_conn_mode_t { } msgnetwork_conn_mode_t; typedef enum peernetwork_id_mode_t { - ID_MODE_ADDR_BASED + ID_MODE_ADDR_BASED, + ID_MODE_CERT_BASED } peernetwork_id_mode_t; #ifdef __cplusplus diff --git a/include/salticidae/stream.h b/include/salticidae/stream.h index 2efc532..2f41782 100644 --- a/include/salticidae/stream.h +++ b/include/salticidae/stream.h @@ -546,7 +546,9 @@ int64_t datastream_get_i64(datastream_t *self, bool *succ); const uint8_t *datastream_get_data_inplace(datastream_t *self, size_t len); uint256_t *datastream_get_hash(const datastream_t *self); bytearray_t *bytearray_new_moved_from_datastream(datastream_t *_moved_self); +bytearray_t *bytearray_new_copied_from_datastream(datastream_t *src); bytearray_t *bytearray_new_from_hex(const char *hex_str); +bytearray_t *bytearray_new_from_bytes(const uint8_t *arr, size_t len); char *datastream_get_hex(datastream_t *self); -- cgit v1.2.3