From ef43ef6293669cc7f7a5aa40a01b27e02dae91d8 Mon Sep 17 00:00:00 2001 From: Bjorn Andersson Date: Sun, 28 Jan 2007 12:31:04 +0000 Subject: [PATCH] query is now an enum for compile-time checks --- src/dns.c | 4 ++-- src/dns.h | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/dns.c b/src/dns.c index 2f8392f..32ce5d5 100644 --- a/src/dns.c +++ b/src/dns.c @@ -201,7 +201,7 @@ dns_send_version(int dns_fd, int version) } int -dns_encode(char *buf, size_t buflen, struct query *q, int qr, char *data, size_t datalen) +dns_encode(char *buf, size_t buflen, struct query *q, qr_t qr, char *data, size_t datalen) { HEADER *header; short name; @@ -273,7 +273,7 @@ dns_encode(char *buf, size_t buflen, struct query *q, int qr, char *data, size_t } int -dns_decode(char *buf, size_t buflen, struct query *q, int qr, char *packet, size_t packetlen) +dns_decode(char *buf, size_t buflen, struct query *q, qr_t qr, char *packet, size_t packetlen) { char rdata[4*1024]; HEADER *header; diff --git a/src/dns.h b/src/dns.h index b696ffb..8b23cf5 100644 --- a/src/dns.h +++ b/src/dns.h @@ -17,6 +17,11 @@ #ifndef _DNS_H_ #define _DNS_H_ +typedef enum { + QR_QUERY = 0, + QR_ANSWER = 1 +} qr_t; + int open_dns(int, in_addr_t); int dns_settarget(const char*); void dns_set_topdomain(const char*); @@ -29,8 +34,8 @@ void dns_send_version(int, int); void dns_login(int, char *, int); int dns_read(int, char *, int); int dns_encode_hostname(const char *, char *, int); -int dns_encode(char *, size_t, struct query *, int, char *, size_t); -int dns_decode(char *, size_t, struct query *, int, char *, size_t); +int dns_encode(char *, size_t, struct query *, qr_t, char *, size_t); +int dns_decode(char *, size_t, struct query *, qr_t, char *, size_t); extern struct sockaddr_in peer; @@ -44,7 +49,4 @@ void dnsd_queuepacket(const char *, const int); int dns_parse_reply(char *, int, char *, int); -#define QR_QUERY 0 -#define QR_ANSWER 1 - #endif /* _DNS_H_ */