extract canary_fill and canary_valid_p.
Merge branch 'master' of github.com:akr/socket-test