#include "ircd.h"
#include "res.h"
#include "reslib.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "numeric.h"
#include "client.h" /* SNO_* */
static struct reslist *find_id(int id);
static struct DNSReply *make_dnsreply(struct reslist *request);
-extern struct rb_sockaddr_storage irc_nsaddr_list[IRCD_MAXNS];
-extern int irc_nscount;
extern char irc_domain[HOSTLEN + 1];
static int res_ourserver(const struct rb_sockaddr_storage *inp)
{
#ifdef RB_IPV6
- struct sockaddr_in6 *v6;
- struct sockaddr_in6 *v6in = (struct sockaddr_in6 *)inp;
+ const struct sockaddr_in6 *v6;
+ const struct sockaddr_in6 *v6in = (const struct sockaddr_in6 *)inp;
#endif
- struct sockaddr_in *v4;
- struct sockaddr_in *v4in = (struct sockaddr_in *)inp;
+ const struct sockaddr_in *v4;
+ const struct sockaddr_in *v4in = (const struct sockaddr_in *)inp;
int ns;
for (ns = 0; ns < irc_nscount; ns++)
{
const struct rb_sockaddr_storage *srv = &irc_nsaddr_list[ns];
#ifdef RB_IPV6
- v6 = (struct sockaddr_in6 *)srv;
+ v6 = (const struct sockaddr_in6 *)srv;
#endif
- v4 = (struct sockaddr_in *)srv;
+ v4 = (const struct sockaddr_in *)srv;
/* could probably just memcmp(srv, inp, srv.ss_len) here
* but we'll air on the side of caution - stu
{
irc_res_init();
- if (res_fd <= 0) /* there isn't any such thing as fd 0, that's just a myth. */
+ if (res_fd == NULL)
{
if ((res_fd = rb_socket(irc_nsaddr_list[0].ss_family, SOCK_DGRAM, 0,
"UDP resolver socket")) == NULL)
{
char host_name[HOSTLEN + 1];
- strlcpy(host_name, name, HOSTLEN + 1);
+ rb_strlcpy(host_name, name, HOSTLEN + 1);
add_local_domain(host_name, HOSTLEN);
if (request == NULL)
request->state = REQ_A;
}
- strlcpy(request->queryname, host_name, sizeof(request->queryname));
+ rb_strlcpy(request->queryname, host_name, sizeof(request->queryname));
request->type = type;
query_name(request);
}
if (addr->ss_family == AF_INET)
{
- struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
+ const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr;
cp = (const unsigned char *)&v4->sin_addr.s_addr;
rb_sprintf(request->queryname, "%u.%u.%u.%u.in-addr.arpa", (unsigned int)(cp[3]),
#ifdef RB_IPV6
else if (addr->ss_family == AF_INET6)
{
- struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
+ const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr;
cp = (const unsigned char *)&v6->sin6_addr.s6_addr;
(void)sprintf(request->queryname, "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
else if (n == 0)
return (0); /* no more answers left */
- strlcpy(request->name, hostbuf, HOSTLEN + 1);
+ rb_strlcpy(request->name, hostbuf, HOSTLEN + 1);
return (1);
break;
for (i = 0; i < irc_nscount; i++)
{
- if (!inetntop_sock((struct sockaddr *)&(irc_nsaddr_list[i]),
+ if (!rb_inet_ntop_sock((struct sockaddr *)&(irc_nsaddr_list[i]),
ipaddr, sizeof ipaddr))
- strlcpy(ipaddr, "?", sizeof ipaddr);
+ rb_strlcpy(ipaddr, "?", sizeof ipaddr);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"A %s", ipaddr);
}