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
---
/dev/null | 12 ------------
dns.c | 22 +++++++++++-----------
2 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/dns.c b/dns.c
index 068753f..7499788 100644
--- a/dns.c
+++ b/dns.c
@@ -63,16 +63,16 @@
/* Pointers to record components */
struct RES_RECORD
{
- unsigned char* name;
+ char* name;
struct R_DATA resource;
- unsigned char* rdata;
+ char* rdata;
};
void resolve(unsigned char* buf, char* hostname, char* dns_ip, int query_type)
{
- int s, i, j;
- struct sockaddr_in dest, a;
- unsigned char *qname, *reader;
+ int s, i;
+ struct sockaddr_in dest;
+ unsigned char *qname;
struct DNS_HEADER* dns = (struct DNS_HEADER*)buf;
struct QUESTION* qinfo;
@@ -121,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)];
@@ -136,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];
}
@@ -231,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++) {
@@ -248,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) {
diff --git a/dns.h b/dns.h
deleted file mode 100644
index b6e6a90..0000000
--- a/dns.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// DNS resource records
-#define T_A 1 // IPv4 address
-#define T_NS 2 // 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 T_TXT 16 // Text record
-#define T_AAAA 28 // IPv6 address
-
-void resolve(unsigned char* buf, char* hostname, char* dns_ip, int query_type);
-void print_packet(unsigned char* buf);
--
Gitblit v1.10.0