From: ian <ian>
Date: Sat, 8 May 1999 15:40:59 +0000 (+0000)
Subject: Portability fixes (missing struct in_addr, INADDR_LOOPBACK defs, rrs=0
X-Git-Tag: rel-adns-0-2~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=71a6ff46a019b9f9fdeefac45037ac6d68571d01

Portability fixes (missing struct in_addr, INADDR_LOOPBACK defs, rrs=0
ipv rrs.untyped=0, -lsocket, etc.
---

diff --git a/changelog b/changelog
index e1fa705..386c190 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,18 @@
+adns (0.2) experimental; urgency=low
+
+  Portability fixes:
+  * Include <sys/socket.h> and <netinet/in.h> in files with <arpa/inet.h>.
+  * Don't use GCC union assignment feature (.rrs=0 => .rrs.untyped=0).
+  * Explictly cast things to [const] struct sockaddr* in syscall args.
+  * Check whether we need -lsocket.
+
+ --
+
 adns (0.1) experimental; urgency=low
 
   * Initial public alpha release.
 
- --
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Sat, 17 April 1999 17:42:19
 
 Local variables:
 mode: debian-changelog
diff --git a/src/query.c b/src/query.c
index 0debcd1..2302c81 100644
--- a/src/query.c
+++ b/src/query.c
@@ -76,7 +76,7 @@ static adns_query query_alloc(adns_state ads, const typeinfo *typei,
   qu->answer->type= typei->type;
   qu->answer->expires= -1;
   qu->answer->nrrs= 0;
-  qu->answer->rrs= 0;
+  qu->answer->rrs.untyped= 0;
   qu->answer->rrsz= typei->rrsz;
 
   return qu;
@@ -334,7 +334,7 @@ void adns__reset_cnameonly(adns_query qu) {
   assert(!qu->final_allocspace);
   cancel_children(qu);
   qu->answer->nrrs= 0;
-  qu->answer->rrs= 0;
+  qu->answer->rrs.untyped= 0;
   qu->interim_allocd= qu->answer->cname ? MEM_ROUND(strlen(qu->answer->cname)+1) : 0;
 }
 
diff --git a/src/setup.c b/src/setup.c
index 7833356..2765dc4 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -29,6 +29,8 @@
 #include <fcntl.h>
 
 #include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include "internal.h"
diff --git a/src/transmit.c b/src/transmit.c
index 84df59f..e373b48 100644
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include <sys/types.h>
 #include <sys/uio.h>
 
 #include "internal.h"
@@ -234,7 +235,8 @@ void adns__query_udp(adns_query qu, struct timeval now) {
   servaddr.sin_addr= ads->servers[serv].addr;
   servaddr.sin_port= htons(DNS_PORT);
   
-  r= sendto(ads->udpsocket,qu->query_dgram,qu->query_dglen,0,&servaddr,sizeof(servaddr));
+  r= sendto(ads->udpsocket,qu->query_dgram,qu->query_dglen,0,
+	    (const struct sockaddr*)&servaddr,sizeof(servaddr));
   if (r<0 && errno == EMSGSIZE) { query_usetcp(qu,now); return; }
   if (r<0) adns__warn(ads,serv,0,"sendto failed: %s",strerror(errno));
   
diff --git a/src/types.c b/src/types.c
index 50fb1e8..042675a 100644
--- a/src/types.c
+++ b/src/types.c
@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include "internal.h"