* Add if (_x->da) (void) talloc_get_type_abort(_x->da, DICT_ATTR);
* to the macro below when dictionaries are talloced.
*/
-# define VERIFY_VP(_x) fr_verify_vp(_x)
-# define VERIFY_LIST(_x) fr_verify_list(NULL, _x)
+# define VERIFY_VP(_x) fr_verify_vp(__FILE__, __LINE__, _x)
+# define VERIFY_LIST(_x) fr_verify_list(__FILE__, __LINE__, NULL, _x)
# define VERIFY_PACKET(_x) (void) talloc_get_type_abort(_x, RADIUS_PACKET)
#else
/*
#define TAG_NONE 0
/** Check if tags are equal
*
- * @param _s tag were matching on.
- * @param _a tag belonging to the attribute were checking.
+ * @param _x tag were matching on.
+ * @param _y tag belonging to the attribute were checking.
*/
-#define TAG_EQ(_s, _a) ((_s == _a) || (_s == TAG_ANY) || ((_s == TAG_NONE) && (_a == TAG_ANY)))
+#define TAG_EQ(_x, _y) ((_x == _y) || (_x == TAG_ANY) || ((_x == TAG_NONE) && (_y == TAG_ANY)))
+#define ATTRIBUTE_EQ(_x, _y) ((_x && _y) && (_x->da == _y->da) && (!_x->da->flags.has_tag || TAG_EQ(_x->tag, _y->tag)))
#define NUM_ANY INT_MIN
#define NUM_JOIN (INT_MIN + 1)
struct in_addr ip4addr;
struct in6_addr ip6addr; /* maybe defined in missing.h */
} ipaddr;
+ uint8_t prefix;
uint32_t scope; /* for IPv6 */
} fr_ipaddr_t;
#define is_truncated(_ret, _max) ((_ret) >= (_max))
#define truncate_len(_ret, _max) (((_ret) >= (_max)) ? ((_max) - 1) : _ret)
+size_t vp_data_prints_value(char *out, size_t outlen,
+ DICT_ATTR const *da, value_data_t const *data, size_t data_len, int8_t quote);
size_t vp_prints_value(char *out, size_t outlen, VALUE_PAIR const *vp, int8_t quote);
size_t vp_prints_value_json(char *out, size_t outlen, VALUE_PAIR const *vp);
size_t vp_prints(char *out, size_t outlen, VALUE_PAIR const *vp);
void fr_md5_calc(uint8_t *, uint8_t const *, unsigned int);
-/* hmac.c */
-
-void fr_hmac_md5(uint8_t const *text, size_t text_len, uint8_t const *key, size_t key_len, unsigned char *digest);
-
-/* hmacsha1.c */
-
-void fr_hmac_sha1(uint8_t const *text, size_t text_len, uint8_t const *key, size_t key_len, uint8_t *digest);
-
/* radius.c */
int rad_send(RADIUS_PACKET *, RADIUS_PACKET const *, char const *secret);
bool rad_packet_ok(RADIUS_PACKET *packet, int flags, decode_fail_t *reason);
int rad_tlv_ok(uint8_t const *data, size_t length,
size_t dv_type, size_t dv_length);
-ssize_t data2vp(RADIUS_PACKET *packet, RADIUS_PACKET const *original,
+ssize_t data2vp(TALLOC_CTX *ctx,
+ RADIUS_PACKET *packet, RADIUS_PACKET const *original,
char const *secret,
DICT_ATTR const *da, uint8_t const *start,
size_t const attrlen, size_t const packetlen,
VALUE_PAIR **pvp);
-ssize_t rad_attr2vp(RADIUS_PACKET *packet, RADIUS_PACKET const *original,
+ssize_t rad_attr2vp(TALLOC_CTX *ctx,
+ RADIUS_PACKET *packet, RADIUS_PACKET const *original,
char const *secret,
uint8_t const *data, size_t length,
VALUE_PAIR **pvp);
-ssize_t rad_data2vp(unsigned int attribute, unsigned int vendor,
- uint8_t const *data, size_t length,
- VALUE_PAIR **pvp);
-
ssize_t rad_vp2data(uint8_t const **out, VALUE_PAIR const *vp);
int rad_vp2extended(RADIUS_PACKET const *packet,
bool pairvalidate(VALUE_PAIR const *failed[2], VALUE_PAIR *filter, VALUE_PAIR *list);
bool pairvalidate_relaxed(VALUE_PAIR const *failed[2], VALUE_PAIR *filter, VALUE_PAIR *list);
VALUE_PAIR *paircopyvp(TALLOC_CTX *ctx, VALUE_PAIR const *vp);
-VALUE_PAIR *paircopyvpdata(TALLOC_CTX *ctx, DICT_ATTR const *da, VALUE_PAIR const *vp);
VALUE_PAIR *paircopy(TALLOC_CTX *ctx, VALUE_PAIR *from);
VALUE_PAIR *paircopy2(TALLOC_CTX *ctx, VALUE_PAIR *from, unsigned int attr, unsigned int vendor, int8_t tag);
VALUE_PAIR *pairsteal(TALLOC_CTX *ctx, VALUE_PAIR *from);
void pairstrsteal(VALUE_PAIR *vp, char const *src);
void pairstrcpy(VALUE_PAIR *vp, char const * src);
void pairstrncpy(VALUE_PAIR *vp, char const * src, size_t len);
+int pairdatacpy(VALUE_PAIR *vp, DICT_ATTR const *da, value_data_t const *data, size_t len);
void pairsprintf(VALUE_PAIR *vp, char const * fmt, ...) CC_HINT(format (printf, 2, 3));
void pairmove(TALLOC_CTX *ctx, VALUE_PAIR **to, VALUE_PAIR **from);
void pairfilter(TALLOC_CTX *ctx, VALUE_PAIR **to, VALUE_PAIR **from,
* Several handy miscellaneous functions.
*/
int fr_set_signal(int sig, sig_t func);
-TALLOC_CTX *fr_autofree_ctx(void);
+int fr_link_talloc_ctx_free(TALLOC_CTX *parent, TALLOC_CTX *child);
char const *fr_inet_ntop(int af, void const *src);
char const *ip_ntoa(char *, uint32_t);
+int fr_pton4(fr_ipaddr_t *out, char const *value, size_t inlen, bool resolve, bool fallback);
+int fr_pton6(fr_ipaddr_t *out, char const *value, size_t inlen, bool resolve, bool fallback);
+int fr_pton(fr_ipaddr_t *out, char const *value, size_t inlen, bool resolve);
+bool is_wildcard(fr_ipaddr_t *addr);
+int fr_ntop(char *out, size_t outlen, fr_ipaddr_t *addr);
char *ifid_ntoa(char *buffer, size_t size, uint8_t const *ifid);
uint8_t *ifid_aton(char const *ifid_str, uint8_t *ifid);
int rad_lockfd(int fd, int lock_len);
int rad_lockfd_nonblock(int fd, int lock_len);
int rad_unlockfd(int fd, int lock_len);
size_t fr_bin2hex(char *hex, uint8_t const *bin, size_t inlen);
-size_t fr_hex2bin(uint8_t *bin, char const *hex, size_t outlen);
+size_t fr_hex2bin(uint8_t *bin, size_t outlen, char const *hex, size_t inlen);
uint32_t fr_strtoul(char const *value, char **end);
bool is_whitespace(char const *value);
bool is_integer(char const *value);
int fr_ipaddr_cmp(fr_ipaddr_t const *a, fr_ipaddr_t const *b);
-int ip_ptonx(char const *src, fr_ipaddr_t *dst);
-int ip_hton(char const *src, int af, fr_ipaddr_t *dst);
+int ip_hton(fr_ipaddr_t *out, int af, char const *hostname, bool fallback);
char const *ip_ntoh(fr_ipaddr_t const *src, char *dst, size_t cnt);
-struct in_addr fr_ipaddr_mask(struct in_addr const *ipaddr, uint8_t prefix);
-struct in6_addr fr_ipaddr_mask6(struct in6_addr const *ipaddr, uint8_t prefix);
+struct in_addr fr_inaddr_mask(struct in_addr const *ipaddr, uint8_t prefix);
+struct in6_addr fr_in6addr_mask(struct in6_addr const *ipaddr, uint8_t prefix);
+void fr_ipaddr_mask(fr_ipaddr_t *addr, uint8_t prefix);
int fr_ipaddr2sockaddr(fr_ipaddr_t const *ipaddr, uint16_t port,
struct sockaddr_storage *sa, socklen_t *salen);
int fr_sockaddr2ipaddr(struct sockaddr_storage const *sa, socklen_t salen,
#ifdef WITH_ASCEND_BINARY
/* filters.c */
int ascend_parse_filter(VALUE_PAIR *vp, char const *value, size_t len);
-void print_abinary(char *out, size_t outlen, VALUE_PAIR const *vp, int8_t quote);
+void print_abinary(char *out, size_t outlen, uint8_t const *data, size_t len, int8_t quote);
#endif /*WITH_ASCEND_BINARY*/
/* random numbers in isaac.c */
void fr_fault_set_log_fd(int fd);
#ifdef WITH_VERIFY_PTR
-void fr_verify_vp(VALUE_PAIR const *vp);
-void fr_verify_list(TALLOC_CTX *expected, VALUE_PAIR *vps);
+void fr_verify_vp(char const *file, int line, VALUE_PAIR const *vp);
+void fr_verify_list(char const *file, int line, TALLOC_CTX *expected, VALUE_PAIR *vps);
#endif
/* rbtree.c */
typedef int (*rb_walker_t)(void *ctx, void *data);
typedef void (*rb_free_t)(void *data);
-rbtree_t *rbtree_create(rb_comparator_t compare, rb_free_t node_free, int flags);
+rbtree_t *rbtree_create(TALLOC_CTX *ctx, rb_comparator_t compare, rb_free_t node_free, int flags);
void rbtree_free(rbtree_t *tree);
bool rbtree_insert(rbtree_t *tree, void *data);
rbnode_t *rbtree_insert_node(rbtree_t *tree, void *data);
projects / freeradius.git / blobdiff