aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dns.h
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2011-02-23 00:51:02 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2011-02-23 00:51:02 +0000
commit921e6d0b9dd70053272c7e0452507d2a17fa4b27 (patch)
treeadfd156482ef20ce84a4fb62abe389cf2e894b52 /epan/dissectors/packet-dns.h
parentefdc54839ceb089538e440f552e1364565b0712b (diff)
Split get_dns_name() into get_dns_name() and expand_dns_name().
In dissect_ms_compressed_string() dissect_mscldap_string() simply call expand_dns_name() instead of using duplicate (and insecure) code. This *might* break CLDAP and SMB dissection. If that's the case we should probably revert get_dns_name() and simplify expand_dns_name(). Fixes infinite recursion errors found by joernchen of Phenoelit. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36029 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dns.h')
-rw-r--r--epan/dissectors/packet-dns.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-dns.h b/epan/dissectors/packet-dns.h
index 1406b83517..b6135e5cf7 100644
--- a/epan/dissectors/packet-dns.h
+++ b/epan/dissectors/packet-dns.h
@@ -29,6 +29,8 @@
const char *dns_class_name(int class);
+int expand_dns_name(tvbuff_t *, int, int, int, const guchar **);
+/* Just like expand_dns_name, but pretty-prints empty names. */
int get_dns_name(tvbuff_t *, int, int, int, const guchar **);
#define MAXDNAME 1025 /* maximum domain name length */