WIP: Fix call hangup

Call hangup is broken - as the end receiving the hang up doesn't get hung up.

This PR:
- Ensures we store the callid in the incoming call
- Adds the callid when sending a hangup as a result of the timeout.

Still to do:
- See if we can write a functional test.