From b6574898519ef89d5481ad677347f0630c877561 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Tue, 20 Oct 2020 13:29:13 +0000
Subject: [PATCH] Specify number of serves and hosts, test and sort servers
---
main.c | 91 +++++++++++++++++++++++++--------------------
1 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/main.c b/main.c
index 009234a..3db7eee 100644
--- a/main.c
+++ b/main.c
@@ -9,78 +9,87 @@
#define NUM_TESTS 10
-struct timespec test_server(char *dns_addr, struct hosts_list *hosts);
+int test_dns(struct dns_list *dnss, struct hosts_list *hosts, int num_hosts, int num_tests);
+struct timespec test_server(struct dns_list *dns, struct hosts_list *hosts, int num_hosts, int num_tests);
int main(int argc, char** argv)
{
- int option, type = T_A;
- char* server = "1.1.1.1", *hostname = "google.com";
+ int option, num_hosts = 0, added_hosts = 0, num_tests = NUM_TESTS;
struct hosts_list *servers_hosts = NULL;
struct dns_list *servers_dns = NULL;
- while((option = getopt(argc, argv, "s:h:t:")) != -1) {
+ while((option = getopt(argc, argv, "s:h:t:n:")) != -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);
+ added_hosts++;
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);
- }
+ case 't': //set number of hosts to test
+ num_hosts = atoi(optarg);
+ break;
+ case 'n': //number of tests to perform
+ num_tests = atoi(optarg);
break;
case '?':
default:
printf("Error: invalid option -%c\n", optopt);
+ free_dns_list(&servers_dns);
+ free_hosts_list(&servers_hosts);
exit(1);
}
}
- struct timespec total;
- total = test_server(server, servers_hosts);
- printf("Test took %ld.%09lds\n", total.tv_sec, total.tv_nsec);
+ if (num_hosts == 0 || num_hosts > NUM_HOSTNAMES+added_hosts) {
+ num_hosts = NUM_HOSTNAMES + added_hosts;
+ }
+ for (int i = added_hosts; i < num_hosts; i++) {
+ add_hosts_server(&servers_hosts, HOSTNAMES[i-added_hosts]);
+ }
+ for (int i = 0; i < NUM_DNS; i++) {
+ add_dns_server(&servers_dns, DNS_SERVERS[i]);
+ }
+ test_dns(servers_dns, servers_hosts, num_hosts, num_tests);
+ sort_servers(&servers_dns);
+ print_servers(servers_dns);
free_dns_list(&servers_dns);
free_hosts_list(&servers_hosts);
return 0;
}
-struct timespec test_server(char* dns_addr, struct hosts_list *hosts)
+int test_dns(struct dns_list *dnss, struct hosts_list *hosts, int num_hosts, int num_tests)
{
- struct timespec total;
- total.tv_sec = 0; total.tv_nsec = 0;
- for (int i = 0; i < NUM_TESTS; i++) {
+ struct dns_list *curr = dnss;
+ while (curr) {
+ test_server(curr, hosts, num_hosts, num_tests);
+ curr = curr->next;
+ }
+ return 0;
+}
+
+struct timespec test_server(struct dns_list *dns, struct hosts_list *hosts, int num_hosts, int num_tests)
+{
+ unsigned long long avg_nsec = 0;
+ dns->time.tv_sec = 0; dns->time.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;
+ run = resolve(buf, curr->server, dns->server, T_A);
+ if (run.tv_sec == -1)
+ continue;
+ dns->time.tv_sec += run.tv_sec;
+ dns->time.tv_nsec += run.tv_nsec;
+ if (dns->time.tv_nsec >= 1000000000) {
+ dns->time.tv_sec += 1;
+ dns->time.tv_nsec -= 1000000000;
}
curr = curr->next;
}
}
- return total;
+ avg_nsec = 1000000000*(dns->time.tv_sec%(num_hosts*num_tests))+dns->time.tv_nsec;
+ dns->time.tv_sec = dns->time.tv_sec/(num_hosts*num_tests);
+ dns->time.tv_nsec = avg_nsec/(num_hosts*num_tests);
+ return dns->time;
}
--
Gitblit v1.10.0