From b58fa4979463db1e5ac322618541aa8942ca4a75 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sun, 18 Oct 2020 13:35:22 +0000
Subject: [PATCH] fixed cast warnings
---
dns.c | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/dns.c b/dns.c
index 042902b..7499788 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
@@ -60,18 +63,18 @@
/* Pointers to record components */
struct RES_RECORD
{
- unsigned char* name;
+ char* name;
struct R_DATA resource;
- unsigned char* rdata;
+ 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;
- struct DNS_HEADER* dns = NULL;
- struct QUESTION* qinfo = NULL;
+ int s, i;
+ struct sockaddr_in dest;
+ unsigned char *qname;
+ struct DNS_HEADER* dns = (struct DNS_HEADER*)buf;
+ struct QUESTION* qinfo;
s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
dest.sin_family = AF_INET;
@@ -79,7 +82,6 @@
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
@@ -111,11 +113,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;
}
@@ -124,7 +121,7 @@
struct RES_RECORD answers[20], auth[20], addit[20];
struct DNS_HEADER *dns;
struct sockaddr_in a;
- char* qname = buf+sizeof(struct DNS_HEADER), *reader;
+ unsigned char* qname = buf+sizeof(struct DNS_HEADER), *reader;
int stop, i, j;
dns = (struct DNS_HEADER*)buf;
reader = &buf[sizeof(struct DNS_HEADER)+strlen((const char*)qname)+1+sizeof(struct QUESTION)];
@@ -139,7 +136,7 @@
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));
+ answers[i].rdata = (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];
}
@@ -234,10 +231,10 @@
{
int lock = 0;
char h[300];
- strcpy(h, host);
+ strcpy(h, (char*)host);
strcat((char*)h,".");
- for (int i = 0; i < strlen((char*)h); i++) {
+ for (int i = 0; i < strlen(h); i++) {
if (h[i] == '.') {
*dns++ = i-lock;
for (;lock<i;lock++) {
@@ -251,11 +248,11 @@
char* read_name(unsigned char* reader, unsigned char* buffer, int* count)
{
- unsigned char* name;
+ char* name;
unsigned int p=0, jumped=0, offset;
int i, j;
*count = 1;
- name = (unsigned char*)malloc(256);
+ name = (char*)malloc(256);
name[0]='\0';
while (*reader != 0) {
--
Gitblit v1.10.0