Attachment #885762 for bug #916209




static char buf[1024];
uint64 numqueries = 0;

static unsigned int truncate_len = 512;

static int udp53;


{
  if (!u[j].active) return;
  response_id(u[j].id);
  if (response_len > truncate_len) response_tc();
  socket_send4(udp53,response,response_len,u[j].ip,u[j].port);
  log_querydone(&u[j].active,response_len);
  u[j].active = 0; --uactive;

  if (!cache_init(cachesize))
    strerr_die3x(111,FATAL,"not enough memory for cache of size ",x);

  x = env_get("TRUNCATELEN");
  if (x) {
    scan_ulong(x,&truncate_len);
    if (truncate_len < 512)
      truncate_len = 512;
    if (truncate_len > 16384)
      truncate_len = 16384;
  }

  if (env_get("HIDETTL"))
    response_hidettl();
  if (env_get("FORWARDONLY"))




{
  char *x;
  int udp53;
  unsigned int truncate_len = 512;

  x = env_get("IP");
  if (!x)


  buffer_putsflush(buffer_2,starting);

  x = env_get("TRUNCATELEN");
  if (x) {
    scan_ulong(x,&truncate_len);
    if (truncate_len < 512)
      truncate_len = 512;
    if (truncate_len > 16384)
      truncate_len = 16384;
  }
  for (;;) {
    len = socket_recv4(udp53,buf,sizeof buf,ip,&port);
    if (len < 0) continue;
    if (!doit()) continue;
    if (response_len > truncate_len) response_tc();
    socket_send4(udp53,response,response_len,ip,port);
    /* may block for buffer space; if it fails, too bad */
  }

Return to bug 916209

Lines 52-57 Link Here

(-)djbdns-1.05.o/dnscache.c (-1 / +11 lines)
52	static char buf[1024];	52	static char buf[1024];
53	uint64 numqueries = 0;	53	uint64 numqueries = 0;
54		54
		55	static unsigned int truncate_len = 512;
55		56
56	static int udp53;	57	static int udp53;
57		58
Lines 77-83 Link Here
77	{	78	{
78	if (!u[j].active) return;	79	if (!u[j].active) return;
79	response_id(u[j].id);	80	response_id(u[j].id);
80	if (response_len > 512) response_tc();	81	if (response_len > truncate_len) response_tc();
81	socket_send4(udp53,response,response_len,u[j].ip,u[j].port);	82	socket_send4(udp53,response,response_len,u[j].ip,u[j].port);
82	log_querydone(&u[j].active,response_len);	83	log_querydone(&u[j].active,response_len);
83	u[j].active = 0; --uactive;	84	u[j].active = 0; --uactive;
Lines 430-435 Link Here
430	if (!cache_init(cachesize))	431	if (!cache_init(cachesize))
431	strerr_die3x(111,FATAL,"not enough memory for cache of size ",x);	432	strerr_die3x(111,FATAL,"not enough memory for cache of size ",x);
432		433
		434	x = env_get("TRUNCATELEN");
		435	if (x) {
		436	scan_ulong(x,&truncate_len);
		437	if (truncate_len < 512)
		438	truncate_len = 512;
		439	if (truncate_len > 16384)
		440	truncate_len = 16384;
		441	}
		442
433	if (env_get("HIDETTL"))	443	if (env_get("HIDETTL"))
434	response_hidettl();	444	response_hidettl();
435	if (env_get("FORWARDONLY"))	445	if (env_get("FORWARDONLY"))

Lines 83-88 Link Here

(-)djbdns-1.05.o/server.c (-1 / +10 lines)
83	{	83	{
84	char *x;	84	char *x;
85	int udp53;	85	int udp53;
		86	unsigned int truncate_len = 512;
86		87
87	x = env_get("IP");	88	x = env_get("IP");
88	if (!x)	89	if (!x)
Lines 105-115 Link Here
105		106
106	buffer_putsflush(buffer_2,starting);	107	buffer_putsflush(buffer_2,starting);
107		108
		109	x = env_get("TRUNCATELEN");
		110	if (x) {
		111	scan_ulong(x,&truncate_len);
		112	if (truncate_len < 512)
		113	truncate_len = 512;
		114	if (truncate_len > 16384)
		115	truncate_len = 16384;
		116	}
108	for (;;) {	117	for (;;) {
109	len = socket_recv4(udp53,buf,sizeof buf,ip,&port);	118	len = socket_recv4(udp53,buf,sizeof buf,ip,&port);
110	if (len < 0) continue;	119	if (len < 0) continue;
111	if (!doit()) continue;	120	if (!doit()) continue;
112	if (response_len > 512) response_tc();	121	if (response_len > truncate_len) response_tc();
113	socket_send4(udp53,response,response_len,ip,port);	122	socket_send4(udp53,response,response_len,ip,port);
114	/* may block for buffer space; if it fails, too bad */	123	/* may block for buffer space; if it fails, too bad */
115	}	124	}