Cancel timeout instead of dying when probing as client

This fixes an occasional bug in Trill.  Also, we stop doubly-defining
the ACK and NOACK constants.