From b79b3a7406bc87fc57f4280449d809afad18ae04 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 23 May 2022 12:51:16 +0000
Subject: [PATCH] Fix alignment with clang-format
---
main.c | 404 ++++++++++++++++++++------------------------------------
1 files changed, 146 insertions(+), 258 deletions(-)
diff --git a/main.c b/main.c
index 3c5961c..e9f7e63 100644
--- a/main.c
+++ b/main.c
@@ -1,278 +1,166 @@
+/**
+ * A basic dns benchmark testing program
+ * Tests servers in parallel so reasonably fast
+ * Tried to only use POSIX functions to ensure cross platform compatibility
+ **/
+
+#include "dns.h"
+#include "servers.h"
+#include "slist.h"
+#include <pthread.h>
#include <stdio.h>
#include <stdlib.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 <unistd.h>
-// DNS code copied from
-// https://gist.github.com/fffaraz/9d9170b57791c28ccda9255b48315168
+#define NUM_TESTS 10
-// 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
+int test_dns(void);
+void* test_server(void* in);
+void* print_progress(void* in);
-/* DNS header struct */
-struct DNS_HEADER
-{
- unsigned short id; //ID number
- unsigned char rd :1; //recursion
- unsigned char tc :1; //truncated message
- unsigned char aa :1; //authoritive answer
- unsigned char opcode :4; //message purpose
- unsigned char qr :1; //query response
- unsigned char rcode :4; //response code
- unsigned char cd :1; //checking disabled
- 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 ans_count; //number of answer entries
- unsigned short auth_count; //number of authority entries
- unsigned short add_count; //number of resource entries
-};
-
-/* structured for query structure */
-struct QUESTION
-{
- unsigned short qtype;
- unsigned short qclass;
-};
-
-/* Query structure */
-struct QUERY
-{
- unsigned char* name;
- struct QUESTION* ques;
-};
-
-/* Constant sized fields of record structure */
-#pragma pack(push, 1)
-struct R_DATA
-{
- unsigned short type;
- unsigned short _class;
- unsigned int ttl;
- unsigned short data_len;
-};
-#pragma pack(pop)
-
-/* Pointers to record components */
-struct RES_RECORD
-{
- unsigned char* name;
- struct R_DATA* resource;
- unsigned char* rdata;
-};
-
-void resolve(char* hostname, char* dns_ip, int query_type, int read);
-void change_to_DNS_name_format(unsigned char* dns, unsigned char* host);
-u_char* read_name(unsigned char* reader, unsigned char* buffer, int* count);
+// All global variables as passing to threads in structs caused corruption
+// Variables are only modified before threads are created and as such are
+// thread-safe tests_done is modified to provide a rough count of number of
+// tests being completed for progress measurement
+int tests_done = 0, num_tests = NUM_TESTS, num_servers = NUM_DNS, num_hosts = 0;
+struct hosts_list* hosts = NULL;
+struct dns_list* servers = NULL;
int main(int argc, char** argv)
{
- resolve("google.com", "1.1.1.1", T_A, 1);
- return 0;
+ int option, added_hosts = 0;
+ while ((option = getopt(argc, argv, "s:a:t:n:h")) != -1) {
+ switch (option) {
+ case 's': // server to use
+ add_dns_server(&servers, optarg);
+ num_servers++;
+ break;
+ case 'a': // hostname to search
+ add_hosts_server(&hosts, optarg);
+ added_hosts++;
+ break;
+ 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 '?':
+ case 'h':
+ default:
+ printf("Usage: %s [options]\n", argv[0]);
+ printf("Options:\n");
+ printf("\t-s <server>\tadd a DNS server to be tested\n");
+ printf("\t-a <hostname>\tadd a hostname to be tested\n");
+ printf(
+ "\t-t <number>\tspecify the number of hostnames to be tested, "
+ "capped at 50 + number manually added\n\t\t\tdefaults to test "
+ "all "
+ "available\n");
+ printf(
+ "\t-n <number>\tspecify the number of tests to perform on each "
+ "hostname\n\t\t\tdefaults to 10\n");
+ printf("\t-h\t\tShow this help\n");
+ free_dns_list(&servers);
+ free_hosts_list(&hosts);
+ exit(1);
+ }
+ }
+ 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(&hosts, (char*)HOSTNAMES[i - added_hosts]);
+ }
+ for (int i = 0; i < NUM_DNS; i++) {
+ add_dns_server(&servers, (char*)DNS_SERVERS[i]);
+ }
+ test_dns();
+ sort_servers(&servers);
+ print_servers(servers);
+ free_dns_list(&servers);
+ free_hosts_list(&hosts);
+ return 0;
}
-void resolve(char* hostname, char* dns_ip, int query_type, int read)
+// Test each dns server individually
+// Each test runs in its own thread and results are written to the respective
+// dns_list
+int test_dns(void)
{
- int s, i, j;
- struct sockaddr_in dest, a;
- unsigned char buf[65536], *qname, *reader;
- struct DNS_HEADER* dns = NULL;
- struct QUESTION* qinfo = NULL;
-
- 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);
-
- //dns packet header
- dns = (struct DNS_HEADER*)&buf;
- dns->id = (unsigned short) htons(getpid());
- dns->qr = 0; //make query
- dns->opcode = 0; //standard query
- dns->aa = 0; //not authoritive
- dns->tc = 0; //not trucated
- dns->rd = 1; //want recursion
- dns->ra = 0; //recursion not available
- dns->z = 0;
- dns->ad = 0;
- dns->cd = 0;
- dns->rcode = 0;
- dns->q_count = htons(1); //one question
- dns->ans_count = 0;
- dns->auth_count = 0;
- dns->add_count = 0;
-
- //dns packet query
- qname = (unsigned char*)&buf[sizeof(struct DNS_HEADER)];
- change_to_DNS_name_format(qname, (unsigned char*)hostname);
- qinfo = (struct QUESTION*)&buf[sizeof(struct DNS_HEADER) + strlen((const char*)qname) + 1];
- qinfo->qtype = htons(query_type); //type of query from argument (A,AAAA,MX,CNAME,NS,...)
- qinfo->qclass = htons(1); //internet class
-
- //send request
- // return less than 0 is a fail
- sendto(s,(char*)buf, sizeof(struct DNS_HEADER)+strlen((const char*)qname)+1+sizeof(struct QUESTION), 0, (struct sockaddr*)&dest, sizeof(dest));
-
- //receive response
- //negative return is a fail
- i = sizeof(dest);
- recvfrom(s, (char*)buf, 65536, 0, (struct sockaddr*)&dest, (socklen_t*)&i);
-
- //read response
- if (read) {
- struct RES_RECORD answers[20], auth[20], addit[20];
- int stop;
- dns = (struct DNS_HEADER*)buf;
- reader = &buf[sizeof(struct DNS_HEADER)+strlen((const char*)qname)+1+sizeof(struct QUESTION)];
- printf("Response contains %d Qs, %d ans, %d auth serv, %d add reconds\n", ntohs(dns->q_count), ntohs(dns->ans_count), ntohs(dns->auth_count), ntohs(dns->add_count));
- stop = 0;
- for (i = 0; i < ntohs(dns->ans_count); i++) {
- answers[i].name = read_name(reader, buf, &stop);
- reader = reader + stop;
- answers[i].resource = (struct R_DATA*)reader;
- reader = reader+sizeof(struct R_DATA);
-
- if (ntohs(answers[i].resource->type) == T_A) { //IPv4 address
- answers[i].rdata = (unsigned char*)malloc(ntohs(answers[i].resource->data_len));
- for (j = 0; j < ntohs(answers[i].resource->data_len); j++) {
- answers[i].rdata[j] = reader[j];
- }
- answers[i].rdata[ntohs(answers[i].resource->data_len)] = '\0';
- reader = reader + ntohs(answers[i].resource->data_len);
- } else {
- answers[i].rdata = read_name(reader, buf, &stop);
- reader = reader + stop;
- }
- }
-
- //read authorities
- for (i = 0; i < ntohs(dns->auth_count); i++) {
- auth[i].name = read_name(reader, buf, &stop);
- reader += stop;
- auth[i].resource = (struct R_DATA*)reader;
- reader += sizeof(struct R_DATA);
- auth[i].rdata = read_name(reader, buf, &stop);
- reader += stop;
- }
-
- //read additional
- for (i = 0; i < ntohs(dns->add_count); i++) {
- addit[i].name = read_name(reader, buf, &stop);
- reader += stop;
- addit[i].resource = (struct R_DATA*)reader;
- reader += sizeof(struct R_DATA);
-
- if (ntohs(addit[i].resource->type) == 1) {
- addit[i].rdata = malloc(ntohs(addit[i].resource->data_len));
- for (j = 0; j < ntohs(addit[i].resource->data_len); j++)
- addit[i].rdata[j] = reader[j];
-
- addit[i].rdata[ntohs(addit[i].resource->data_len)] = '\0';
- reader += ntohs(addit[i].resource->data_len);
- } else {
- addit[i].rdata = read_name(reader, buf, &stop);
- reader += stop;
- }
- }
-
- //print answers
- printf("ans recs: %d\n", ntohs(dns->ans_count));
- for (i = 0; i < ntohs(dns->ans_count); i++) {
- printf("name: %s ", answers[i].name);
- if (ntohs(answers[i].resource->type) == T_A) { //IPv4
- long* p;
- p = (long*)answers[i].rdata;
- a.sin_addr.s_addr=(*p);
- printf("has IPv4 addresss: %s", inet_ntoa(a.sin_addr));
- } else if (ntohs(answers[i].resource->type) == T_CNAME) { //CNAME
- printf("has alias: %s", answers[i].rdata);
- }
- putc('\n', stdout);
- }
-
- //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) {
- long* p;
- p = (long*)addit[i].rdata;
- a.sin_addr.s_addr = *p;
- printf("has IPv4 address: %s", inet_ntoa(a.sin_addr));
- }
- putc('\n', stdout);
- }
- }
- return;
+ struct dns_list* curr = servers;
+ int i = 0;
+ pthread_t* threads = malloc(num_servers * sizeof(pthread_t));
+ pthread_t progress;
+ pthread_create(&progress, NULL, print_progress, NULL);
+ while (curr) {
+ pthread_create(&threads[i], NULL, test_server, (void*)curr);
+ curr = curr->next;
+ i++;
+ }
+ for (int i = 0; i < num_servers; i++) {
+ pthread_join(threads[i], NULL);
+ }
+ pthread_cancel(progress);
+ printf("\r100.00%% done\n");
+ free(threads);
+ return 0;
}
-
-void change_to_DNS_name_format(unsigned char* dns, unsigned char* host)
+// Tests an individual dns server with all the hostnames configured
+void* test_server(void* in)
{
- int lock = 0;
- char h[300];
- strcpy(h, host);
- strcat((char*)h,".");
-
- for (int i = 0; i < strlen((char*)h); i++) {
- if (h[i] == '.') {
- *dns++ = i-lock;
- for (;lock<i;lock++) {
- *dns++ = h[lock];
- }
- lock++;
- }
- }
- *dns++ = '\0';
+ unsigned long long avg_nsec = 0;
+ struct dns_list* dns = (struct dns_list*)in;
+ 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;
+ run.tv_sec = -1;
+ run.tv_nsec = 0;
+ unsigned char buf[65536];
+ for (int j = 0; j < 3 && run.tv_sec == -1; j++) {
+ run = resolve(buf, curr->server, dns->server, T_A);
+ }
+ if (run.tv_sec == -1) // if test has failed 3 times, set time taken
+ // to 3s as penalty
+ run.tv_sec = 3;
+ dns->time.tv_sec += run.tv_sec;
+ dns->time.tv_nsec += run.tv_nsec;
+ if (dns->time.tv_nsec >=
+ 1000000000) { // nanoseconds have overflowed into seconds
+ dns->time.tv_sec += 1;
+ dns->time.tv_nsec -= 1000000000;
+ }
+ tests_done++;
+ curr = curr->next;
+ }
+ }
+ 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 NULL;
}
-u_char* read_name(unsigned char* reader, unsigned char* buffer, int* count)
+// Prints the progress every 0.1s for an indication of speed
+// tests_done is being written to in parallel, so may be overwritten but serves
+// as a decent estimate of the progress
+void* print_progress(void* in)
{
- unsigned char* name;
- unsigned int p=0, jumped=0, offset;
- int i, j;
- *count = 1;
- name = (unsigned char*)malloc(256);
- name[0]='\0';
-
- while (*reader != 0) {
- if (*reader >= 192) {
- offset = (*reader)*256+ *(reader+1) - 49152;
- reader = buffer+offset-1;
- jumped=1;
- } else {
- name[p++]=*reader;
- }
- reader = reader+1;
- if (jumped == 0) {
- *count = *count+1;
- }
- }
- name[p] = '\0';
- if (jumped == 1) {
- *count = *count + 1;
- }
-
- //convert from dns format to normal
- for (i = 0; i < strlen((const char*)name); i++) {
- p = name[i];
- for (j = 0; j < p; j++) {
- name[i] = name[i+1];
- i++;
- }
- name[i] = '.';
- }
- name[i-1] = '\0';
- return name;
+ struct timespec s;
+ s.tv_sec = 0;
+ s.tv_nsec = 100000000;
+ while (1) {
+ printf("\r%.2f%% done", ((float)tests_done) /
+ (num_servers * num_hosts * num_tests) *
+ 100);
+ fflush(stdout);
+ nanosleep(&s, NULL);
+ }
+ return NULL;
}
--
Gitblit v1.10.0