]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac3743'
authorThomas Markwalder <tmark@isc.org>
Tue, 21 Apr 2015 11:43:42 +0000 (07:43 -0400)
committerThomas Markwalder <tmark@isc.org>
Tue, 21 Apr 2015 11:43:42 +0000 (07:43 -0400)
    Adds bad-packet logger to DHCPv4 server

1  2 
doc/guide/logging.xml
src/bin/dhcp4/dhcp4_srv.cc
src/lib/dhcp/pkt.h
src/lib/dhcp/pkt4.cc
src/lib/dhcp/pkt4.h

Simple merge
Simple merge
index 1bacff6cb2db3dda2af1dad751271f62043e1014,5f0c5afebf628015ea7e0a652ea9a55d000b4d5b..5f0c5afebf628015ea7e0a652ea9a55d000b4d5b
mode 100644,100755..100644
Simple merge
index d93a56e695e63db08fae55cd1060e18ece25960c,71b729375179d75fe7dda31dad4ed378cf87351d..71b729375179d75fe7dda31dad4ed378cf87351d
mode 100644,100755..100644