X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=util.c;h=d12db66c2361f6c9ebb139fdd007b80b1bb3c70c;hb=19074a85692b26aac9ae7e2f2a607e26741cbf94;hp=a91c073d53f13906a7926ea9a57836a327ae77ad;hpb=c215a4bc817daf7b5631236c3c7b6a509479b034;p=secnet.git diff --git a/util.c b/util.c index a91c073..d12db66 100644 --- a/util.c +++ b/util.c @@ -11,7 +11,7 @@ * * secnet is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but @@ -448,7 +448,7 @@ void send_nak(const struct comm_addr *dest, uint32_t our_index, " %s; sending NAK\n", comm_addr_to_string(dest), our_index, their_index, msgtype, logwhy); - dest->comm->sendmsg(dest->comm->st, buf, dest); + dest->comm->sendmsg(dest->comm->st, buf, dest, 0); } int consttime_memeq(const void *s1in, const void *s2in, size_t n) @@ -521,7 +521,7 @@ void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia, #ifndef CONFIG_IPV6 ia->sin.sin_family=AF_INET; - ia->sin.sin_addr.s_addr=string_item_to_ipaddr(item,desc); + ia->sin.sin_addr.s_addr=htonl(string_item_to_ipaddr(item,desc)); ia->sin.sin_port=htons(port); #else /* CONFIG_IPV6 => we have adns_text2addr */