GitLab

Where a definition list is used to discuss function parameters, use
the <code> modifier to make it more clear that the definition
term is discussing a variable in the function signature mentioned
above the definition list.

This fix was okayed on jabber. It solves the problem in elapsed time
calculation between two DHCP packets. If the timestamp for both packets
is equal, the elapsed time is now 0. Previously, an exception was thrown.

This mitigates the problem whereby a packet sent in one test is not dropped
by a kernel and affects the subsequent test. The increased timeout works
around this problem. However, at some point there may be a need to
implement more proper solution (test should capture the packet sent and
drop it on its own, then start another test).

The DNSClient uses timeout specified in ms. The documentation was wrong
saying that the timeout is specified in seconds.

merge in origin/trac2945 for some doxygen fixes

Conflicts:
	src/lib/dhcp/iface_mgr.cc

This is required by the log4cplus library.

fix merge conflicts

This is for ticket 2945.
Don't use grep -q (not portable).
Also use quotes around "$werror_ok" just in test just in case is unset.

No changelog message as it appears it worked before but was just noisy.

Conflicts:
	src/bin/dhcp4/dhcp4_srv.cc
	src/bin/dhcp4/tests/dhcp4_test_utils.h
	src/bin/dhcp6/dhcp6_srv.cc
	src/lib/dhcp/pkt4.cc
	src/lib/dhcp/tests/pkt4_unittest.cc

 - Dhcpv{4,6}Srv::classifyPacket() is now better commented.
 - constants are now used instead of magic numbers
 - Pkt{4,6}::addClass is now better commented

Conflicts:
	src/lib/dhcp/iface_mgr.cc