chiark
/
gitweb
/
~mdw
/
adns
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright dates fixed; various TODOs added.
[adns]
/
src
/
internal.h
diff --git
a/src/internal.h
b/src/internal.h
index 27d025878ef00136d20e862d36de7d30ac00eaeb..f0f9147f5cbf55e813691155871efd6047dc6539 100644
(file)
--- a/
src/internal.h
+++ b/
src/internal.h
@@
-5,7
+5,7
@@
* - comments regarding library data structures
*/
/*
* - comments regarding library data structures
*/
/*
- * This file is part of adns, which is Copyright (C) 1997
, 1998
Ian Jackson
+ * This file is part of adns, which is Copyright (C) 1997
-1999
Ian Jackson
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-25,7
+25,7
@@
#ifndef ADNS_INTERNAL_H_INCLUDED
#define ADNS_INTERNAL_H_INCLUDED
#ifndef ADNS_INTERNAL_H_INCLUDED
#define ADNS_INTERNAL_H_INCLUDED
-#
define PRINTFFORMAT(a,b) __attribute__((format(printf,a,b)))
+#
include "config.h"
typedef unsigned char byte;
#include <stdarg.h>
typedef unsigned char byte;
#include <stdarg.h>
@@
-39,7
+39,8
@@
typedef unsigned char byte;
/* Configuration and constants */
#define MAXSERVERS 5
/* Configuration and constants */
#define MAXSERVERS 5
-#define UDPMAXRETRIES /*15*/5
+#define MAXSORTLIST 15
+#define UDPMAXRETRIES 15
#define UDPRETRYMS 2000
#define TCPMS 30000
#define LOCALRESOURCEMS 20
#define UDPRETRYMS 2000
#define TCPMS 30000
#define LOCALRESOURCEMS 20
@@
-115,7
+116,7
@@
typedef struct {
* nsstart is the offset of the authority section.
*/
* nsstart is the offset of the authority section.
*/
- int (*diff_needswap)(const void *datap_a, const void *datap_b);
+ int (*diff_needswap)(
adns_state ads,
const void *datap_a, const void *datap_b);
/* Returns !0 if RR a should be strictly after RR b in the sort order,
* 0 otherwise. Must not fail.
*/
/* Returns !0 if RR a should be strictly after RR b in the sort order,
* 0 otherwise. Must not fail.
*/
@@
-243,12
+244,15
@@
struct adns__state {
struct { adns_query head, tail; } timew, childw, output;
int nextid, udpsocket, tcpsocket;
vbuf tcpsend, tcprecv;
struct { adns_query head, tail; } timew, childw, output;
int nextid, udpsocket, tcpsocket;
vbuf tcpsend, tcprecv;
- int nservers, tcpserver;
+ int nservers,
nsortlist,
tcpserver;
enum adns__tcpstate { server_disconnected, server_connecting, server_ok } tcpstate;
struct timeval tcptimeout;
struct server {
struct in_addr addr;
} servers[MAXSERVERS];
enum adns__tcpstate { server_disconnected, server_connecting, server_ok } tcpstate;
struct timeval tcptimeout;
struct server {
struct in_addr addr;
} servers[MAXSERVERS];
+ struct sortlist {
+ struct in_addr base, mask;
+ } sortlist[MAXSORTLIST];
};
/* From setup.c: */
};
/* From setup.c: */
@@
-289,7
+293,8
@@
const char *adns__diag_domain(adns_state ads, int serv, adns_query qu,
*/
void adns__isort(void *array, int nobjs, int sz, void *tempbuf,
*/
void adns__isort(void *array, int nobjs, int sz, void *tempbuf,
- int (*needswap)(const void *a, const void *b));
+ int (*needswap)(void *context, const void *a, const void *b),
+ void *context);
/* Does an insertion sort of array which must contain nobjs objects
* each sz bytes long. tempbuf must point to a buffer at least
* sz bytes long. needswap should return !0 if a>b (strictly, ie
/* Does an insertion sort of array which must contain nobjs objects
* each sz bytes long. tempbuf must point to a buffer at least
* sz bytes long. needswap should return !0 if a>b (strictly, ie