branch changes some

modified dhcp.c .h