-
/*
- * $Id$
- *
* Low level DNS protocol routines
* AUTHOR: Amos Jeffries, Rafael Martinez Torres
*
*
*/
-#include "config.h"
+#include "squid.h"
+#include "compat/inet_pton.h"
#include "util.h"
#if HAVE_STDIO_H
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
#if HAVE_MEMORY_H
#include <memory.h>
#endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
#if HAVE_ASSERT_H
#include <assert.h>
#endif
#include <strings.h>
#endif
+#include "rfc2671.h"
#include "rfc3596.h"
#ifndef SQUID_RFC1035_H
* Returns the size of the query
*/
ssize_t
-rfc3596BuildHostQuery(const char *hostname, char *buf, size_t sz, unsigned short qid, rfc1035_query * query, int qtype)
+rfc3596BuildHostQuery(const char *hostname, char *buf, size_t sz, unsigned short qid, rfc1035_query * query, int qtype, ssize_t edns_sz)
{
static rfc1035_message h;
size_t offset = 0;
h.rd = 1;
h.opcode = 0; /* QUERY */
h.qdcount = (unsigned int) 1;
+ h.arcount = (edns_sz > 0 ? 1 : 0);
offset += rfc1035HeaderPack(buf + offset, sz - offset, &h);
offset += rfc1035QuestionPack(buf + offset,
sz - offset,
hostname,
qtype,
RFC1035_CLASS_IN);
+ if (edns_sz > 0)
+ offset += rfc2671RROptPack(buf + offset, sz - offset, edns_sz);
if (query) {
query->qtype = qtype;
* \return the size of the query
*/
ssize_t
-rfc3596BuildAQuery(const char *hostname, char *buf, size_t sz, unsigned short qid, rfc1035_query * query)
+rfc3596BuildAQuery(const char *hostname, char *buf, size_t sz, unsigned short qid, rfc1035_query * query, ssize_t edns_sz)
{
- return rfc3596BuildHostQuery(hostname, buf, sz, qid, query, RFC1035_TYPE_A);
+ return rfc3596BuildHostQuery(hostname, buf, sz, qid, query, RFC1035_TYPE_A, edns_sz);
}
/**
* \return the size of the query
*/
ssize_t
-rfc3596BuildAAAAQuery(const char *hostname, char *buf, size_t sz, unsigned short qid, rfc1035_query * query)
+rfc3596BuildAAAAQuery(const char *hostname, char *buf, size_t sz, unsigned short qid, rfc1035_query * query, ssize_t edns_sz)
{
- return rfc3596BuildHostQuery(hostname, buf, sz, qid, query, RFC1035_TYPE_AAAA);
+ return rfc3596BuildHostQuery(hostname, buf, sz, qid, query, RFC1035_TYPE_AAAA, edns_sz);
}
-
/**
* Builds a message buffer with a QUESTION to lookup PTR records
* for an address. Caller must allocate 'buf' which should
* \return the size of the query
*/
ssize_t
-
-rfc3596BuildPTRQuery4(const struct in_addr addr, char *buf, size_t sz, unsigned short qid, rfc1035_query * query)
+rfc3596BuildPTRQuery4(const struct in_addr addr, char *buf, size_t sz, unsigned short qid, rfc1035_query * query, ssize_t edns_sz)
{
static char rev[RFC1035_MAXHOSTNAMESZ];
unsigned int i;
(i >> 16) & 255,
(i >> 24) & 255);
- return rfc3596BuildHostQuery(rev, buf, sz, qid, query, RFC1035_TYPE_PTR);
+ return rfc3596BuildHostQuery(rev, buf, sz, qid, query, RFC1035_TYPE_PTR, edns_sz);
}
ssize_t
-
-rfc3596BuildPTRQuery6(const struct in6_addr addr, char *buf, size_t sz, unsigned short qid, rfc1035_query * query)
+rfc3596BuildPTRQuery6(const struct in6_addr addr, char *buf, size_t sz, unsigned short qid, rfc1035_query * query, ssize_t edns_sz)
{
static char rev[RFC1035_MAXHOSTNAMESZ];
const uint8_t* r = addr.s6_addr;
char* p = rev;
- int i; // NP: MUST allow signed for loop termination.
+ int i; /* NP: MUST allow signed for loop termination. */
/* work from the raw addr field. anything else may have representation changes. */
/* The sin6_port and sin6_addr members shall be in network byte order. */
for (i = 15; i >= 0; i--, p+=4) {
- snprintf(p, 5, "%1x.%1x.", ((r[i]>>4)&0xf), (r[i])&0xf );
+ snprintf(p, 5, "%1x.%1x.", ((r[i])&0xf), (r[i]>>4)&0xf );
}
snprintf(p,10,"ip6.arpa.");
- return rfc3596BuildHostQuery(rev, buf, sz, qid, query, RFC1035_TYPE_PTR);
+ return rfc3596BuildHostQuery(rev, buf, sz, qid, query, RFC1035_TYPE_PTR, edns_sz);
}
-
#if DRIVER
/* driver needs the rfc1035 code _without_ the main() */
# undef main(a,b)
#include <sys/socket.h>
-#include <sys/time.h>
int
main(int argc, char *argv[])
{
- char input[512];
- char buf[512];
- char rbuf[512];
- size_t sz = 512;
+#define PACKET_BUFSZ 1024
+ char input[PACKET_BUFSZ];
+ char buf[PACKET_BUFSZ];
+ char rbuf[PACKET_BUFSZ];
+ size_t sz = PACKET_BUFSZ;
unsigned short sid, sidb;
int s;
int rl;
+ ssize_t edns_max = -1;
struct sockaddr* S;
int var = 1;
prefer = AF_INET;
else if (argv[var][1] == '6')
prefer = AF_INET6;
+ else if (argv[var][1] == 'E')
+ edns_max = atoi(argv[var++]);
else {
- fprintf(stderr, "usage: %s [-6|-4] ip port\n", argv[0]);
+ fprintf(stderr, "usage: %s [-6|-4] [-E packet-size] ip port\n", argv[0]);
+ fprintf(stderr, " EDNS packets my be up to %d\n", PACKET_BUFSZ);
return 1;
}
return 1;
}
-
memset(&S, '\0', sizeof(S));
if (prefer == 6) {
((struct sockaddr_in6 *)S)->sin6_family = AF_INET6;
((struct sockaddr_in6 *)S)->sin6_port = htons(atoi(argv[var+1]));
- if ( ! xinet_pton(AF_INET6, argv[var], &((struct sockaddr_in6 *)S)->sin6_addr.s_addr) )
+ if ( ! inet_pton(AF_INET6, argv[var], &((struct sockaddr_in6 *)S)->sin6_addr.s_addr) ) {
perror("listen address");
- return 1;
- }
+ return 1;
+ }
- s = socket(PF_INET6, SOCK_DGRAM, 0);
-}
-else
-{
- S = (struct sockaddr *) new sockaddr_in;
- memset(S,0,sizeof(struct sockaddr_in));
+ s = socket(PF_INET6, SOCK_DGRAM, 0);
+ } else {
+ S = (struct sockaddr *) new sockaddr_in;
+ memset(S,0,sizeof(struct sockaddr_in));
- ((struct sockaddr_in *)S)->sin_family = AF_INET;
- ((struct sockaddr_in *)S)->sin_port = htons(atoi(argv[var+1]));
+ ((struct sockaddr_in *)S)->sin_family = AF_INET;
+ ((struct sockaddr_in *)S)->sin_port = htons(atoi(argv[var+1]));
- if ( ! xinet_pton(AF_INET, argv[var], &((struct sockaddr_in *)S)->sin_addr.s_addr) )
- perror("listen address");
- return 1;
-}
+ if ( ! inet_pton(AF_INET, argv[var], &((struct sockaddr_in *)S)->sin_addr.s_addr) )
+ perror("listen address");
+ return 1;
+ }
}
-while (fgets(input, 512, stdin))
+while (fgets(input, PACKET_BUFSZ, stdin))
{
struct in6_addr junk6;
struct in_addr junk4;
strtok(input, "\r\n");
- memset(buf, '\0', 512);
- sz = 512;
+ memset(buf, '\0', PACKET_BUFSZ);
+ sz = PACKET_BUFSZ;
- if (xinet_pton(AF_INET6, input, &junk6)) {
- sid = rfc1035BuildPTRQuery6(junk6, buf, &sz);
+ if (inet_pton(AF_INET6, input, &junk6)) {
+ sid = rfc1035BuildPTRQuery6(junk6, buf, &sz, edns_max);
sidb=0;
- } else if (xinet_pton(AF_INET, input, &junk4)) {
- sid = rfc1035BuildPTRQuery4(junk4, buf, &sz);
+ } else if (inet_pton(AF_INET, input, &junk4)) {
+ sid = rfc1035BuildPTRQuery4(junk4, buf, &sz, edns_max);
sidb=0;
} else {
- sid = rfc1035BuildAAAAQuery(input, buf, &sz);
- sidb = rfc1035BuildAQuery(input, buf, &sz);
+ sid = rfc1035BuildAAAAQuery(input, buf, &sz, edns_max);
+ sidb = rfc1035BuildAQuery(input, buf, &sz, edns_max);
}
sendto(s, buf, sz, 0, S, sizeof(*S));
continue;
}
- memset(rbuf, '\0', 512);
- rl = recv(s, rbuf, 512, 0);
+ memset(rbuf, '\0', PACKET_BUFSZ);
+ rl = recv(s, rbuf, PACKET_BUFSZ, 0);
{
unsigned short rid = 0;
int i;
&rid);
if (n < 0) {
- printf("ERROR %d\n", rfc1035_errno);
+ printf("ERROR %d\n", -n);
} else if (rid != sid && rid != sidb) {
printf("ERROR, ID mismatch (%#hx, %#hx)\n", sid, rid);
printf("ERROR, ID mismatch (%#hx, %#hx)\n", sidb, rid);
if (answers[i].type == RFC1035_TYPE_A) {
struct in_addr a;
+ char tmp[16];
memcpy(&a, answers[i].rdata, 4);
- printf("A\t%d\t%s\n", answers[i].ttl, inet_ntoa(a));
+ printf("A\t%d\t%s\n", answers[i].ttl, inet_ntop(AF_INET,&a,tmp,16));
} else if (answers[i].type == RFC1035_TYPE_AAAA) {
struct in6_addr a;
+ char tmp[INET6_ADDRSTRLEN];
memcpy(&a, answers[i].rdata, 16);
- printf("AAAA\t%d\t%s\n", answers[i].ttl, inet_ntoa(a));
+ printf("AAAA\t%d\t%s\n", answers[i].ttl, inet_ntop(AF_INET6,&a,tmp,sizeof(tmp)));
} else if (answers[i].type == RFC1035_TYPE_PTR) {
char ptr[RFC1035_MAXHOSTNAMESZ];
strncpy(ptr, answers[i].rdata, answers[i].rdlength);
}
return 0;
- }
+}
#endif
projects / thirdparty / squid.git / blobdiff