X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnetutl.h;h=ebba1ac3c27c3b2553712d906b37990e2c677bb9;hb=f31267783fccb4e17d914c64243b0cba4e5632c4;hp=2d402c2e917b5858245e5c30ebc909e9224c671d;hpb=9415f4b08fb2ca9ae933edd0bf8b096db195ebae;p=meshlink diff --git a/src/netutl.h b/src/netutl.h index 2d402c2e..ebba1ac3 100644 --- a/src/netutl.h +++ b/src/netutl.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_NETUTL_H +#define MESHLINK_NETUTL_H + /* netutl.h -- header file for netutl.c - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014, 2017 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,21 +20,21 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __MESHLINK_NETUTL_H__ -#define __MESHLINK_NETUTL_H__ - #include "net.h" +#include "packmsg.h" -extern bool hostnames; - -extern struct addrinfo *str2addrinfo(const char *, const char *, int) __attribute__ ((__malloc__)); +extern struct addrinfo *str2addrinfo(const char *, const char *, int) __attribute__((__malloc__)); extern sockaddr_t str2sockaddr(const char *, const char *); extern void sockaddr2str(const sockaddr_t *, char **, char **); -extern char *sockaddr2hostname(const sockaddr_t *) __attribute__ ((__malloc__)); +extern char *sockaddr2hostname(const sockaddr_t *) __attribute__((__malloc__)); extern int sockaddrcmp(const sockaddr_t *, const sockaddr_t *); extern int sockaddrcmp_noport(const sockaddr_t *, const sockaddr_t *); extern void sockaddrunmap(sockaddr_t *); extern void sockaddrfree(sockaddr_t *); extern void sockaddrcpy(sockaddr_t *, const sockaddr_t *); +extern void sockaddrcpy_setport(sockaddr_t *, const sockaddr_t *, uint16_t port); + +extern void packmsg_add_sockaddr(struct packmsg_output *out, const sockaddr_t *); +extern sockaddr_t packmsg_get_sockaddr(struct packmsg_input *in); -#endif /* __MESHLINK_NETUTL_H__ */ +#endif