From 0f826d0a73bb1bbed0dd38b914be40ca8dc491ea Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sun, 18 Oct 2020 12:35:02 +0000
Subject: [PATCH] Buf is passed in so can be read separately, removed functions from header
---
dns.c | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/dns.c b/dns.c
index bfe157d..233050a 100644
--- a/dns.c
+++ b/dns.c
@@ -9,6 +9,9 @@
#include <unistd.h>
#include "dns.h"
+void change_to_DNS_name_format(unsigned char* dns, unsigned char* host);
+char* read_name(unsigned char* reader, unsigned char* buffer, int* count);
+
// DNS code copied from
// https://gist.github.com/fffaraz/9d9170b57791c28ccda9255b48315168
@@ -26,7 +29,7 @@
unsigned char ad :1; //authenticated data
unsigned char z :1; //reserved for future use
unsigned char ra :1; //recursion available
- unsigned short q_count; //number of question entries
+ unsigned short q_count; //number of question entrise
unsigned short ans_count; //number of answer entries
unsigned short auth_count; //number of authority entries
unsigned short add_count; //number of resource entries
@@ -65,11 +68,11 @@
unsigned char* rdata;
};
-void resolve(char* hostname, char* dns_ip, int query_type, int read)
+void resolve(unsigned char* buf, char* hostname, char* dns_ip, int query_type)
{
int s, i, j;
struct sockaddr_in dest, a;
- unsigned char buf[65536], *qname, *reader;
+ unsigned char *qname, *reader;
struct DNS_HEADER* dns = NULL;
struct QUESTION* qinfo = NULL;
@@ -79,7 +82,7 @@
dest.sin_addr.s_addr = inet_addr(dns_ip);
//dns packet header
- dns = (struct DNS_HEADER*)&buf;
+ dns = (struct DNS_HEADER*)buf;
dns->id = (unsigned short) htons(getpid());
dns->qr = 0; //make query
dns->opcode = 0; //standard query
@@ -111,11 +114,6 @@
//negative return is a fail
i = sizeof(dest);
recvfrom(s, (char*)buf, 65536, 0, (struct sockaddr*)&dest, (socklen_t*)&i);
-
- //read response
- if (read) {
- print_packet(buf);
- }
return;
}
@@ -192,6 +190,7 @@
} else if (ntohs(answers[i].resource.type) == T_CNAME) { //CNAME
printf("has alias: %s", answers[i].rdata);
}
+ free(answers[i].name);
free(answers[i].rdata);
putc('\n', stdout);
}
@@ -199,16 +198,33 @@
//print authorities
printf("Auth recs: %d\n", ntohs(dns->auth_count));
for (i = 0; i < ntohs(dns->auth_count); i++) {
- printf("name: %s ", addit[i].name);
- if (ntohs(addit[i].resource.type) == 1) {
+ printf("name: %s ", auth[i].name);
+ if (ntohs(auth[i].resource.type) == 1) {
long* p;
- p = (long*)addit[i].rdata;
+ p = (long*)auth[i].rdata;
a.sin_addr.s_addr = *p;
printf("has IPv4 address: %s", inet_ntoa(a.sin_addr));
}
+ free(answers[i].name);
free(auth[i].rdata);
putc('\n', stdout);
}
+
+ printf("Addit recs: %d\n", ntohs(dns->add_count));
+ for (i = 0; i < ntohs(dns->add_count); i++) {
+ printf("name; %s", addit[i].name);
+ if (ntohs(auth[i].resource.type) == 1) {
+ long *p;
+ p = (long*)addit[i].rdata;
+ a.sin_addr.s_addr = *p;
+ printf("has IPv4 address: %s", inet_ntoa(a.sin_addr));
+ } else {
+ printf("has %s", addit[i].rdata);
+ }
+ free(answers[i].name);
+ free(addit[i].rdata);
+ putc('\n', stdout);
+ }
}
--
Gitblit v1.10.0