Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/dist/bind Pull up revisions 1.6-1.7 (requested by itojun):
details: https://anonhg.NetBSD.org/src/rev/202c2f08d233
branches: netbsd-1-5
changeset: 493185:202c2f08d233
user: he <he%NetBSD.org@localhost>
date: Mon Jul 01 17:15:35 2002 +0000
description:
Pull up revisions 1.6-1.7 (requested by itojun):
Update BIND to version 8.3.3.
diffstat:
dist/bind/bin/named/ns_func.h | 93 ++++++++++++++++++++-------------------
dist/bind/include/resolv.h | 99 ++++++++++++++++++++++++++++++++++++++----
2 files changed, 136 insertions(+), 56 deletions(-)
diffs (truncated from 450 to 300 lines):
diff -r 163d06ccd566 -r 202c2f08d233 dist/bind/bin/named/ns_func.h
--- a/dist/bind/bin/named/ns_func.h Mon Jul 01 17:15:30 2002 +0000
+++ b/dist/bind/bin/named/ns_func.h Mon Jul 01 17:15:35 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ns_func.h,v 1.2.8.3 2001/01/28 15:52:53 he Exp $ */
+/* $NetBSD: ns_func.h,v 1.2.8.4 2002/07/01 17:15:35 he Exp $ */
/*
* Copyright (c) 1985, 1990
@@ -92,51 +92,43 @@
/* ns_func.h - declarations for ns_*.c's externally visible functions
*
- * Id: ns_func.h,v 8.104 2001/01/25 05:50:54 marka Exp
+ * Id: ns_func.h,v 8.117 2002/04/25 05:27:07 marka Exp
*/
/* ++from ns_glue.c++ */
struct in_addr ina_get(const u_char *data);
const char * sin_ntoa(struct sockaddr_in);
int ns_wouldlog(int category, int level);
-void ns_debug(int, int, const char *, ...)
- __attribute__((__format__(__printf__, 3, 4)));
-void ns_info(int, const char *, ...)
- __attribute__((__format__(__printf__, 2, 3)));
-void ns_notice(int, const char *, ...)
- __attribute__((__format__(__printf__, 2, 3)));
-void ns_warning(int, const char *, ...)
- __attribute__((__format__(__printf__, 2, 3)));
-void ns_error(int, const char *, ...)
- __attribute__((__format__(__printf__, 2, 3)));
-void ns_panic(int, int, const char *, ...)
- __attribute__((__format__(__printf__, 3, 4)));
-void ns_assertion_failed(char *file, int line,
- assertion_type type, char *cond,
- int print_errno);
-
-#define panic(a, b) ns_panic(ns_log_default, 1, a, b)
-
-void gettime(struct timeval *);
+void ns_debug(int, int, const char *, ...) ISC_FORMAT_PRINTF(3, 4);
+void ns_info(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+void ns_notice(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+void ns_warning(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+void ns_error(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+void ns_critical(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+void ns_panic(int, int, const char *, ...) ISC_FORMAT_PRINTF(3, 4);
+void ns_assertion_failed(const char *file, int line,
+ assertion_type type,
+ const char *cond, int print_errno);
+void panic(const char *, const void *);
+void gettime(struct timeval *);
int nlabels(const char *);
int my_close(int);
int my_fclose(FILE *);
-void __freestr(char *);
+void * __freestr(char *);
char * __newstr(size_t, int);
char * __savestr(const char *, int);
-char * checked_ctime(const time_t *t);
-char * ctimel(long);
-void __freestr_record(char *, char *, int);
-char * __newstr_record(size_t, int, char *, int);
-char * __savestr_record(const char *, int, char *, int);
+const char * checked_ctime(const time_t *t);
+const char * ctimel(long);
+void * __freestr_record(char *, const char *, int);
+char * __newstr_record(size_t, int, const char *, int);
+char * __savestr_record(const char *, int, const char *, int);
u_char * ina_put(struct in_addr ina, u_char *data);
u_char * savebuf(const u_char *, size_t, int);
-void dprintf(int level, const char *format, ...)
- __attribute__((__format__(__printf__, 2, 3)));
+void dprintf(int level, const char *format, ...) ISC_FORMAT_PRINTF(2, 3);
#ifdef DEBUG_STRINGS
char * debug_newstr(size_t, int, const char *, int);
char * debug_savestr(const char *, int, const char *, int);
-void debug_freestr(char *, const char *, int);
+void * debug_freestr(char *, const char *, int);
#define newstr(l, n) debug_newstr((l), (n), __FILE__, __LINE__)
#define savestr(s, n) debug_savestr((s), (n), __FILE__, __LINE__)
#define freestr(s) debug_freestr((s), __FILE__, __LINE__)
@@ -169,7 +161,8 @@
void delete_all(struct namebuf *, int, int);
int delete_stale(struct namebuf *);
struct qinfo * sysquery(const char *, int, int,
- struct in_addr *, int, u_int16_t, int);
+ struct in_addr *, struct dst_key **keys,
+ int, u_int16_t, int, int);
int doupdate(u_char *, u_char *, struct databuf **,
int, int, int, u_int, struct sockaddr_in);
int send_msg(u_char *, int, struct qinfo *);
@@ -184,6 +177,14 @@
/* --from ns_resp.c-- */
/* ++from ns_req.c++ */
+int ns_get_opt(u_char *msg, u_char *eom,
+ u_int8_t *versionp, u_int16_t *rcodep,
+ u_int16_t *flagp, u_int16_t *bufsizep,
+ u_char **optionsp, size_t *optsizep);
+int ns_add_opt(u_char *msg, u_char *cp, size_t buflen,
+ u_int8_t version, u_int16_t rcode,
+ u_int16_t size, u_int16_t flags,
+ u_char *options, size_t optlen);
void ns_req(u_char *, int, int,
struct qstream *,
struct sockaddr_in,
@@ -202,6 +203,7 @@
int findZonePri(const struct zoneinfo *,
const struct sockaddr_in);
#endif
+int drop_port(u_int16_t);
/* --from ns_req.c-- */
/* ++from ns_xfr.c++ */
@@ -222,8 +224,8 @@
void ns_ctl_defaults(controls *);
void ns_ctl_add(controls *, control);
control ns_ctl_new_inet(struct in_addr, u_int, ip_match_list);
-#ifndef WINNT
-control ns_ctl_new_unix(char *, mode_t, uid_t, gid_t);
+#ifndef NO_SOCKADDR_UN
+control ns_ctl_new_unix(const char *, mode_t, uid_t, gid_t);
#endif
void ns_ctl_install(controls *);
/* --from ns_ctl.c-- */
@@ -259,10 +261,10 @@
void reset_retrytimer(void);
void retrytimer(evContext ctx, void *uap,
struct timespec due, struct timespec ival);
-void retry(struct qinfo *);
+void retry(struct qinfo *, int);
void qflush(void);
void qremove(struct qinfo *);
-void ns_freeqns(struct qinfo *, char *);
+void ns_freeqns(struct qinfo *);
void ns_freeqry(struct qinfo *);
void freeComplaints(void);
void nsfwdadd(struct qinfo *, struct fwdinfo *);
@@ -277,7 +279,7 @@
void sq_flushw(struct qstream *);
void sq_flush(struct qstream *allbut);
void dq_remove_gen(time_t gen);
-void dq_remove_all();
+void dq_remove_all(void);
void sq_done(struct qstream *);
void ns_setproctitle(char *, int);
void getnetconf(int);
@@ -313,6 +315,7 @@
void printzoneinfo(int, int, int);
#endif
void endxfer(void);
+void tryxfer(void);
void addxfer(struct zoneinfo *);
void ns_zreload(void);
void ns_reload(void);
@@ -396,8 +399,7 @@
int zonedump(struct zoneinfo *zp, int isixfr);
void dynamic_about_to_exit(void);
enum req_action req_update(HEADER *hp, u_char *cp, u_char *eom,
- u_char *msg, struct qstream *qsp,
- int dfd, struct sockaddr_in from,
+ u_char *msg, struct sockaddr_in from,
struct tsig_record *in_tsig);
void rdata_dump(struct databuf *dp, FILE *fp);
/* --from ns_update.c-- */
@@ -422,7 +424,7 @@
int set_zone_filename(zone_config, char *);
int set_zone_checknames(zone_config, enum severity);
#ifdef BIND_NOTIFY
-int set_zone_notify(zone_config, int value);
+int set_zone_notify(zone_config, enum notify value);
#endif
int set_zone_maintain_ixfr_base(zone_config, int value);
int set_zone_update_acl(zone_config, ip_match_list);
@@ -432,7 +434,8 @@
int set_zone_pubkey(zone_config, const int, const int,
const int, const char *);
int set_zone_transfer_time_in(zone_config, long);
-int add_zone_master(zone_config, struct in_addr);
+int add_zone_master(zone_config, struct in_addr,
+ struct dst_key *);
#ifdef BIND_NOTIFY
int add_zone_notify(zone_config, struct in_addr);
#endif
@@ -463,8 +466,8 @@
ip_match_element new_ip_match_localnets(void);
void ip_match_negate(ip_match_element);
void add_to_ip_match_list(ip_match_list, ip_match_element);
-void dprint_ip_match_list(int, ip_match_list, int, char *,
- char *);
+void dprint_ip_match_list(int, ip_match_list, int,
+ const char *, const char *);
int ip_match_address(ip_match_list, struct in_addr);
int ip_match_addr_or_key(ip_match_list, struct in_addr,
struct dst_key *key);
@@ -513,10 +516,10 @@
/* --from ns_config.c-- */
/* ++from parser.y++ */
-ip_match_list lookup_acl(char *);
-void define_acl(char *, ip_match_list);
+ip_match_list lookup_acl(const char *);
+void define_acl(const char *, ip_match_list);
struct dst_key *lookup_key(char *);
-void define_key(char *, struct dst_key *);
+void define_key(const char *, struct dst_key *);
time_t parse_configuration(const char *);
void parser_initialize(void);
void parser_shutdown(void);
diff -r 163d06ccd566 -r 202c2f08d233 dist/bind/include/resolv.h
--- a/dist/bind/include/resolv.h Mon Jul 01 17:15:30 2002 +0000
+++ b/dist/bind/include/resolv.h Mon Jul 01 17:15:35 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: resolv.h,v 1.3.4.3 2001/01/28 15:52:53 he Exp $ */
+/* $NetBSD: resolv.h,v 1.3.4.4 2002/07/01 17:15:36 he Exp $ */
/*
* Copyright (c) 1983, 1987, 1989
@@ -52,7 +52,7 @@
/*
* @(#)resolv.h 8.1 (Berkeley) 6/2/93
- * Id: resolv.h,v 8.32 2000/12/23 08:14:49 vixie Exp
+ * Id: resolv.h,v 8.48 2002/05/31 06:05:29 marka Exp
*/
#ifndef _RESOLV_H_
@@ -65,7 +65,9 @@
# include <sys/types.h>
#endif
#include <sys/cdefs.h>
+#include <sys/socket.h>
#include <stdio.h>
+#include <arpa/nameser.h>
/*
* Revision information. This is the release date in YYYYMMDD format.
@@ -98,7 +100,9 @@
#define RES_SET_H_ERRNO(r,x) __h_errno_set(r,x)
struct __res_state; /* forward */
+__BEGIN_DECLS
void __h_errno_set(struct __res_state *res, int err);
+__END_DECLS
/*
* Resolver configuration file.
@@ -113,14 +117,14 @@
typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
res_sendhookact;
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
+typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr * const *ns,
const u_char **query,
int *querylen,
u_char *ans,
int anssiz,
int *resplen));
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
+typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr *ns,
const u_char *query,
int querylen,
u_char *ans,
@@ -128,9 +132,9 @@
int *resplen));
struct res_sym {
- int number; /* Identifying number, like T_MX */
- char * name; /* Its symbolic name, like "MX" */
- char * humanname; /* Its fun name, like "mail exchanger" */
+ int number; /* Identifying number, like T_MX */
+ const char * name; /* Its symbolic name, like "MX" */
+ const char * humanname; /* Its fun name, like "mail exchanger" */
};
/*
@@ -149,10 +153,16 @@
#define RES_DFLRETRY 2 /* Default #/tries. */
#define RES_MAXTIME 65535 /* Infinity, in milliseconds. */
+struct __res_state_ext;
+
struct __res_state {
int retrans; /* retransmition time interval */
int retry; /* number of times to retransmit */
+#ifdef sun
+ u_int options; /* option flags - see below. */
+#else
u_long options; /* option flags - see below. */
+#endif
int nscount; /* number of name servers */
struct sockaddr_in
nsaddr_list[MAXNS]; /* address of name server */
@@ -160,7 +170,11 @@
u_short id; /* current message id */
char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */
char defdname[256]; /* default domain (deprecated) */
+#ifdef sun
Home |
Main Index |
Thread Index |
Old Index