From 415e3b82ed70c48f61b51b7a93576335af2da7cb Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 19 Oct 2020 13:18:16 +0000
Subject: [PATCH] Added list for dns servers and hostnames
---
main.c | 106 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 32 deletions(-)
diff --git a/main.c b/main.c
index 15ea1d1..009234a 100644
--- a/main.c
+++ b/main.c
@@ -1,44 +1,86 @@
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include <string.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netint/in.h>
-//#include <netdb.h>
-#include <sys/time.h>
+#include <time.h>
+#include "dns.h"
+#include "servers.h"
+#include "slist.h"
-// DNS resource records
-#define T_A 1 // IPv4 address
-#define T_NS // Name Server
-#define T_CNAME 5 // Cannonical name
-#define T_SOA 6 // State of Authority
-#define T_PTR 12 // Domain name pointer
-#define T_MX 15 // Mail exchange
+#define NUM_TESTS 10
-struct DNS_QUERY
-{
- unsigned short id; //ID number
- unsigned char rd :1; //recursion
- unsigned char aa :1; //truncated message
- unsigned char opcode :4; //message purpose
- unsigned char qr :1; //query/response
- unsigned char rcode :4; //response code
-
-}
+struct timespec test_server(char *dns_addr, struct hosts_list *hosts);
int main(int argc, char** argv)
{
-
+ int option, type = T_A;
+ char* server = "1.1.1.1", *hostname = "google.com";
+ struct hosts_list *servers_hosts = NULL;
+ struct dns_list *servers_dns = NULL;
+ while((option = getopt(argc, argv, "s:h:t:")) != -1) {
+ switch (option) {
+ case 's': //server to use
+ add_dns_server(&servers_dns, optarg);
+ break;
+ case 'h': //hostname to search
+ add_hosts_server(&servers_hosts, optarg);
+ break;
+ case 't':
+ if (!strcmp(optarg, "A")) {
+ type = T_A;
+ } else if (!strcmp(optarg, "AAAA")) {
+ type = T_AAAA;
+ } else if (!strcmp(optarg, "NS")) {
+ type = T_NS;
+ } else if (!strcmp(optarg, "CNAME")) {
+ type = T_CNAME;
+ } else if (!strcmp(optarg, "SOA")) {
+ type = T_SOA;
+ } else if (!strcmp(optarg, "PTR")) {
+ type = T_PTR;
+ } else if (!strcmp(optarg, "MX")) {
+ type = T_MX;
+ } else if (!strcmp(optarg, "TXT")) {
+ type = T_TXT;
+ } else {
+ printf("Error: %s is not a valid DNS record type\n", optarg);
+ free_hosts_list(&servers_hosts);
+ free_dns_list(&servers_dns);
+ exit(1);
+ }
+ break;
+ case '?':
+ default:
+ printf("Error: invalid option -%c\n", optopt);
+ exit(1);
+ }
+ }
+ struct timespec total;
+ total = test_server(server, servers_hosts);
+ printf("Test took %ld.%09lds\n", total.tv_sec, total.tv_nsec);
+ free_dns_list(&servers_dns);
+ free_hosts_list(&servers_hosts);
+ return 0;
}
-void resolve(char* hostname, char* dns_ip)
+struct timespec test_server(char* dns_addr, struct hosts_list *hosts)
{
- int s;
- struct sockaddr_in dest;
-
- s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
- dest.sin_family = AF_INET;
- dest.sin_port = htons(53);
- dest.sin_addr.s_addr = inet_addr(dns_ip);
-
+ struct timespec total;
+ total.tv_sec = 0; total.tv_nsec = 0;
+ for (int i = 0; i < NUM_TESTS; i++) {
+ struct hosts_list *curr = hosts;
+ while (curr) {
+ struct timespec run;
+ unsigned char buf[65536];
+ run = resolve(buf, curr->server, dns_addr, T_A);
+ total.tv_sec += run.tv_sec;
+ total.tv_nsec += run.tv_nsec;
+ if (total.tv_nsec >= 1000000000) {
+ total.tv_sec += 1;
+ total.tv_nsec -= 1000000000;
+ }
+ curr = curr->next;
+ }
+ }
+ return total;
}
--
Gitblit v1.10.0