remove redundant unpack in critical path

svn:r3620
This commit is contained in:
Nick Mathewson 2005-02-13 16:17:32 +00:00
parent 5ca04cbf56
commit d90ab823ea

View File

@ -107,9 +107,9 @@ static int relay_digest_matches(crypto_digest_env_t *digest, cell_t *cell) {
static int relay_crypt_one_payload(crypto_cipher_env_t *cipher, char *in, static int relay_crypt_one_payload(crypto_cipher_env_t *cipher, char *in,
int encrypt_mode) { int encrypt_mode) {
char out[CELL_PAYLOAD_SIZE]; /* 'in' must be this size too */ char out[CELL_PAYLOAD_SIZE]; /* 'in' must be this size too */
relay_header_t rh; // relay_header_t rh;
relay_header_unpack(&rh, in); // relay_header_unpack(&rh, in);
// log_fn(LOG_DEBUG,"before crypt: %d",rh.recognized); // log_fn(LOG_DEBUG,"before crypt: %d",rh.recognized);
if (( encrypt_mode && crypto_cipher_encrypt(cipher, out, in, CELL_PAYLOAD_SIZE)) || if (( encrypt_mode && crypto_cipher_encrypt(cipher, out, in, CELL_PAYLOAD_SIZE)) ||
(!encrypt_mode && crypto_cipher_decrypt(cipher, out, in, CELL_PAYLOAD_SIZE))) { (!encrypt_mode && crypto_cipher_decrypt(cipher, out, in, CELL_PAYLOAD_SIZE))) {
@ -117,7 +117,7 @@ static int relay_crypt_one_payload(crypto_cipher_env_t *cipher, char *in,
return -1; return -1;
} }
memcpy(in,out,CELL_PAYLOAD_SIZE); memcpy(in,out,CELL_PAYLOAD_SIZE);
relay_header_unpack(&rh, in); // relay_header_unpack(&rh, in);
// log_fn(LOG_DEBUG,"after crypt: %d",rh.recognized); // log_fn(LOG_DEBUG,"after crypt: %d",rh.recognized);
return 0; return 0;
} }