Change handshake_message by using struct