From 96cf02139c7a0a344f194c95c8d3a64168e45c6b Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Wed, 01 Jun 2022 05:06:10 +0000
Subject: [PATCH] Compiler optimisations breaking things
---
dns.c | 192 +++++++++++++++++++++++-------------------------
1 files changed, 92 insertions(+), 100 deletions(-)
diff --git a/dns.c b/dns.c
index 3708389..c2053dd 100644
--- a/dns.c
+++ b/dns.c
@@ -1,22 +1,24 @@
+#include "dns.h"
#include <arpa/inet.h>
#include <asm-generic/socket.h>
+#include <bits/time.h>
+#include <errno.h>
+#include <linux/if_ether.h>
#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/udp.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
-//#include <netint/in.h>
-//#include <netdb.h>
-//#include <sys/time.h>
-#include "dns.h"
#include <time.h>
#include <unistd.h>
-#include <errno.h>
void change_to_DNS_name_format(unsigned char* dns, unsigned char* host);
char* read_name(unsigned char* reader, unsigned char* buffer, int* count);
-void fill_ICMP_data(unsigned char* icmp_data, int datasize);
-unsigned short icmp_checksum(unsigned short* buf, int size);
+int fill_DNS_data(unsigned char* buf, int datasize, char* hostname,
+ int query_type);
// DNS code copied from
// https://gist.github.com/fffaraz/9d9170b57791c28ccda9255b48315168
@@ -69,25 +71,16 @@
char* rdata;
};
-#define ICMP_ECHO 8
-#define ICMP_ECHOREPLY 0
-
-struct ICMP_HEADER {
- unsigned char type;
- unsigned char code;
- short checksum;
- short id;
- short seq;
- long timestamp;
-};
-
// Test if an IP address is hosting a DNS server
int reachable(unsigned char* buf, char* dns_ip)
{
- int s, r;
- int datasize = 64;
+ int s, r, ret, name_len;
struct sockaddr_in dest;
- struct timespec timeout;
+ socklen_t dest_len = sizeof(dest);
+ struct timespec timeout, start, end;
+ struct icmphdr* icmp_head;
+ struct ip* ip_head;
+ unsigned char buf_send[65535];
timeout.tv_sec = 1;
timeout.tv_nsec = 0;
@@ -95,32 +88,51 @@
dest.sin_port = htons(53);
dest.sin_addr.s_addr = inet_addr(dns_ip);
- if (0) {
- s = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
- if (s < 0) {
- printf("%d, %s\n", s, strerror(errno));
- return -1;
+ s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ r = socket(AF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL));
+ if (r < 0) {
+ /* printf("%d, %s\n", r, strerror(errno)); */
+ return -1;
+ }
+ setsockopt(r, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timespec));
+
+ name_len = fill_DNS_data((unsigned char*)&buf_send, 65535, "google.com", T_A);
+ ret = sendto(s, buf_send,
+ sizeof(struct DNS_HEADER) + name_len + 1 +
+ sizeof(struct QUESTION),
+ 0, (struct sockaddr*)&dest, sizeof(dest));
+
+ if (ret < 0) {
+ return 3;
+ }
+
+ clock_gettime(CLOCK_MONOTONIC, &start);
+ do {
+ ret = recvfrom(r, buf, 65535, 0, (struct sockaddr*)&dest, &dest_len);
+ clock_gettime(CLOCK_MONOTONIC, &end);
+ if (ret < 0) {
+ /* printf("*2, %d, %s\n", ret, strerror(errno)); */
+ break;
}
- setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timespec));
+ if ((ret = memcmp(&buf_send, buf + sizeof(struct ip) + sizeof(struct udphdr), sizeof(struct DNS_HEADER)))) {
+ break;
+ }
+ } while (start.tv_sec + 2 > end.tv_sec);
- fill_ICMP_data(buf, datasize);
- ((struct ICMP_HEADER*)buf)->checksum = icmp_checksum((unsigned short*)buf, datasize);
+ close(s);
+ close(r);
- r = sendto(s, buf, datasize, 0, (struct sockaddr*)&dest, sizeof(dest));
- printf("%d\n", r);
- }
+ ip_head = (struct ip*)buf;
+ icmp_head = (struct icmphdr*)buf + sizeof(struct ip);
- s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (s < 0) {
- printf("%d, %s\n", s, strerror(errno));
- return -1;
- }
- setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timespec));
-
- r = connect(s, (struct sockaddr*)&dest, sizeof(dest));
- printf("%d", r);
-
- return 1;
+ if (ip_head->ip_p != IPPROTO_UDP) {
+ if (ip_head->ip_p == IPPROTO_ICMP) {
+ return 1;
+ } else {
+ return 2;
+ }
+ }
+ return 0;
}
// Test server dns_ip as IPv4 string for hostname
@@ -128,11 +140,9 @@
struct timespec resolve(unsigned char* buf, char* hostname, char* dns_ip,
int query_type)
{
- int s, i;
+ int s, i, name_len;
struct sockaddr_in dest;
- unsigned char* qname;
- struct DNS_HEADER* dns = (struct DNS_HEADER*)buf;
- struct QUESTION* qinfo;
+ socklen_t dest_len = sizeof(dest);
struct timespec start, end, total, timeout;
timeout.tv_nsec = 0;
timeout.tv_sec = 1;
@@ -147,37 +157,13 @@
dest.sin_port = htons(53);
dest.sin_addr.s_addr = inet_addr(dns_ip);
- // dns packet header
- 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
+ name_len = fill_DNS_data(buf, 65535, hostname, query_type);
// send request
// return less than 0 is a fail
clock_gettime(CLOCK_MONOTONIC, &start);
i = sendto(s, (char*)buf,
- sizeof(struct DNS_HEADER) + strlen((const char*)qname) + 1 +
+ sizeof(struct DNS_HEADER) + name_len + 1 +
sizeof(struct QUESTION),
0, (struct sockaddr*)&dest, sizeof(dest));
@@ -186,7 +172,7 @@
// negative return is a fail
i = sizeof(dest);
i = recvfrom(s, (char*)buf, 65536, 0, (struct sockaddr*)&dest,
- (socklen_t*)&i);
+ &dest_len);
clock_gettime(CLOCK_MONOTONIC, &end);
}
@@ -381,33 +367,39 @@
return name;
}
-// Populate the sending ICMP packet with data
-void fill_ICMP_data(unsigned char* icmp_data, int datasize)
+// Populate the sending DNS packet with data
+int fill_DNS_data(unsigned char* buf, int datasize, char* hostname,
+ int query_type)
{
- struct ICMP_HEADER* h = (struct ICMP_HEADER*)icmp_data;
- unsigned char* d = icmp_data + sizeof(struct ICMP_HEADER);
+ struct DNS_HEADER* dns = (struct DNS_HEADER*)buf;
+ struct QUESTION* qinfo;
+ unsigned char* qname;
- h->type = ICMP_ECHO;
- h->code = 0;
- h->id = getpid();
- h->checksum = 0;
- h->seq = 0;
+ // dns packet header
+ 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;
- memset(d, 'A', datasize - sizeof(struct ICMP_HEADER));
-}
+ // 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
-// Calculate the ICMP checksum
-unsigned short icmp_checksum(unsigned short* buf, int size)
-{
- unsigned long checksum = 0;
- while (size > 1) {
- checksum += *buf++;
- size -= sizeof(unsigned short);
- }
- if (size) {
- checksum += *buf;
- }
- checksum = (checksum >> 16) + (checksum & 0xffff);
- checksum += checksum >> 16;
- return (unsigned short)~checksum;
+ return strlen((const char*)qname);
}
--
Gitblit v1.10.0