Merge pfdhcplistener code