| author | Tomas Zeman <tzeman@volny.cz> |
| Fri, 04 May 2012 20:46:26 +0200 | |
| changeset 140 | e924b9ad558a |
| parent 139 | aa877a72e1e8 |
| child 141 | 0f8cd90097d8 |
| permissions | -rw-r--r-- |
| 139 | 1 |
Accept oversize DNS packets; CNAME errors avoidance |
2 |
||
|
140
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
3 |
diff -r 262ce8533627 source/dietlibc/diet-qmail/qmail-103-oversize-dns.patch |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
4 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
5 |
+++ b/source/dietlibc/diet-qmail/qmail-103-oversize-dns.patch Fri May 04 20:46:20 2012 +0200 |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
6 |
@@ -0,0 +1,71 @@ |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
7 |
+http://www.ckdhr.com/ckd/qmail-103.patch |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
8 |
+ |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
9 |
+Description from http://qmail.ruk.cuni.cz/top.html : |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
10 |
+Christopher K. Davis has a patch to accept oversize DNS packets which works on |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
11 |
+both qmail's dns.c and tcpserver's dns.c. If you don't want to patch qmail, you |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
12 |
+can ameliorate the problem somewhat using djbdns, which returns only the |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
13 |
+records you ask for, making for a smaller ANSWER section. |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
14 |
+ |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
15 |
+--- qmail-1.03/dns.c.103 Mon Aug 17 16:06:58 1998 |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
16 |
++++ qmail-1.03/dns.c Wed Aug 26 16:28:56 1998 |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
17 |
+@@ -21,10 +21,12 @@ |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
18 |
+ static unsigned short getshort(c) unsigned char *c; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
19 |
+ { unsigned short u; u = c[0]; return (u << 8) + c[1]; }
|
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
20 |
+ |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
21 |
+-static union { HEADER hdr; unsigned char buf[PACKETSZ]; } response;
|
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
22 |
++static struct { unsigned char *buf; } response;
|
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
23 |
++static int responsebuflen = 0; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
24 |
+ static int responselen; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
25 |
+ static unsigned char *responseend; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
26 |
+ static unsigned char *responsepos; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
27 |
++static u_long saveresoptions; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
28 |
+ |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
29 |
+ static int numanswers; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
30 |
+ static char name[MAXDNAME]; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
31 |
+@@ -45,18 +47,33 @@ |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
32 |
+ errno = 0; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
33 |
+ if (!stralloc_copy(&glue,domain)) return DNS_MEM; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
34 |
+ if (!stralloc_0(&glue)) return DNS_MEM; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
35 |
+- responselen = lookup(glue.s,C_IN,type,response.buf,sizeof(response)); |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
36 |
++ if (!responsebuflen) |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
37 |
++ if (response.buf = (unsigned char *)alloc(PACKETSZ+1)) |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
38 |
++ responsebuflen = PACKETSZ+1; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
39 |
++ else return DNS_MEM; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
40 |
++ |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
41 |
++ responselen = lookup(glue.s,C_IN,type,response.buf,responsebuflen); |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
42 |
++ if ((responselen >= responsebuflen) || |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
43 |
++ (responselen > 0 && (((HEADER *)response.buf)->tc))) |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
44 |
++ {
|
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
45 |
++ if (responsebuflen < 65536) |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
46 |
++ if (alloc_re(&response.buf, responsebuflen, 65536)) |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
47 |
++ responsebuflen = 65536; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
48 |
++ else return DNS_MEM; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
49 |
++ saveresoptions = _res.options; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
50 |
++ _res.options |= RES_USEVC; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
51 |
++ responselen = lookup(glue.s,C_IN,type,response.buf,responsebuflen); |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
52 |
++ _res.options = saveresoptions; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
53 |
++ } |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
54 |
+ if (responselen <= 0) |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
55 |
+ {
|
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
56 |
+ if (errno == ECONNREFUSED) return DNS_SOFT; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
57 |
+ if (h_errno == TRY_AGAIN) return DNS_SOFT; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
58 |
+ return DNS_HARD; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
59 |
+ } |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
60 |
+- if (responselen >= sizeof(response)) |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
61 |
+- responselen = sizeof(response); |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
62 |
+ responseend = response.buf + responselen; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
63 |
+ responsepos = response.buf + sizeof(HEADER); |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
64 |
+- n = ntohs(response.hdr.qdcount); |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
65 |
++ n = ntohs(((HEADER *)response.buf)->qdcount); |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
66 |
+ while (n-- > 0) |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
67 |
+ {
|
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
68 |
+ i = dn_expand(response.buf,responseend,responsepos,name,MAXDNAME); |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
69 |
+@@ -66,7 +83,7 @@ |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
70 |
+ if (i < QFIXEDSZ) return DNS_SOFT; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
71 |
+ responsepos += QFIXEDSZ; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
72 |
+ } |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
73 |
+- numanswers = ntohs(response.hdr.ancount); |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
74 |
++ numanswers = ntohs(((HEADER *)response.buf)->ancount); |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
75 |
+ return 0; |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
76 |
+ } |
|
e924b9ad558a
diet-qmail-oversize-dns.patch
Tomas Zeman <tzeman@volny.cz>
parents:
139
diff
changeset
|
77 |
+ |