X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=15ae528eb4cc8d037e6ebcce6d5d8a32df9e892b;hp=1a9a56084d15860ebacc9ae39c68649a4d394917;hb=ed0bf283e37642f9f7673f664713a16d916bd70f;hpb=35932fe6c8cb481eb687f98424776ce429570c21 diff --git a/src/subnet.c b/src/subnet.c index 1a9a5608..15ae528e 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -17,21 +17,22 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: subnet.c,v 1.1.2.8 2000/10/29 00:02:20 guus Exp $ + $Id: subnet.c,v 1.1.2.10 2000/11/04 11:49:58 guus Exp $ */ -#include -#include - #include "config.h" -#include -#include -#include "subnet.h" -#include "net.h" +#include +#include + #include "conf.h" +#include "net.h" +#include "subnet.h" #include "system.h" +#include +#include + /* lists type of subnet */ subnet_t *subnet_list[SUBNET_TYPES] = { NULL }; @@ -220,7 +221,7 @@ cp asprintf(&netstr, "%d,%lx/%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask); break; case SUBNET_IPV6: - asprintf(&netstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", + asprintf(&netstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", subnet->type, subnet->net.ipv6.address.x[0], subnet->net.ipv6.address.x[1], subnet->net.ipv6.address.x[2],