From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 21 Apr 2015 11:43:42 +0000 (-0400)
Subject: [master] Merge branch 'trac3743'
X-Git-Tag: trac3791_base~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=135ffa24d78747df7dea68524de9e5db14e70df1;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3743'

    Adds bad-packet logger to DHCPv4 server
---

135ffa24d78747df7dea68524de9e5db14e70df1
diff --cc src/lib/dhcp/pkt.h
index 1bacff6cb2,5f0c5afebf..5f0c5afebf
mode 100644,100755..100644
--- a/src/lib/dhcp/pkt.h
+++ b/src/lib/dhcp/pkt.h
diff --cc src/lib/dhcp/pkt4.h
index d93a56e695,71b7293751..71b7293751
mode 100644,100755..100644
--- a/src/lib/dhcp/pkt4.h
+++ b/src/lib/dhcp/pkt4.h