Minor formatting in dhcp.c
Rename one/two to a/b in pair comparison functions to be consistent
Allow sorting with a comparator