diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-10-14 02:47:09 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-10-14 02:47:09 +0000 |
| commit | aebc3a03ba6eea02f4d50fa4bd5dbf49cd37a0c7 (patch) | |
| tree | bd0b81c8f1021d0b8150cd32ba41b4c6c5489e78 /src/or/rendclient.c | |
| parent | 92bb360ad771a4cba21f1e4a77e367f973e546ef (diff) | |
| download | tor-aebc3a03ba6eea02f4d50fa4bd5dbf49cd37a0c7.tar.gz tor-aebc3a03ba6eea02f4d50fa4bd5dbf49cd37a0c7.zip | |
more int to size_t conversions, fixing one or more amd64 bugs
plus a whitespace patch on config.c from vicman
svn:r2482
Diffstat (limited to 'src/or/rendclient.c')
| -rw-r--r-- | src/or/rendclient.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index a0acf6b882..877617354c 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -52,7 +52,8 @@ rend_client_send_establish_rendezvous(circuit_t *circ) */ int rend_client_send_introduction(circuit_t *introcirc, circuit_t *rendcirc) { - int payload_len, r; + size_t payload_len; + int r; char payload[RELAY_PAYLOAD_SIZE]; char tmp[(MAX_NICKNAME_LEN+1)+REND_COOKIE_LEN+DH_KEY_LEN]; rend_cache_entry_t *entry; @@ -152,7 +153,7 @@ rend_client_rendcirc_has_opened(circuit_t *circ) */ int rend_client_introduction_acked(circuit_t *circ, - const char *request, int request_len) + const char *request, size_t request_len) { char *nickname; circuit_t *rendcirc; @@ -280,7 +281,7 @@ rend_client_remove_intro_point(char *failed_intro, const char *query) * the circuit to C_REND_READY. */ int -rend_client_rendezvous_acked(circuit_t *circ, const char *request, int request_len) +rend_client_rendezvous_acked(circuit_t *circ, const char *request, size_t request_len) { /* we just got an ack for our establish-rendezvous. switch purposes. */ if(circ->purpose != CIRCUIT_PURPOSE_C_ESTABLISH_REND) { @@ -295,7 +296,7 @@ rend_client_rendezvous_acked(circuit_t *circ, const char *request, int request_l /** Bob sent us a rendezvous cell; join the circuits. */ int -rend_client_receive_rendezvous(circuit_t *circ, const char *request, int request_len) +rend_client_receive_rendezvous(circuit_t *circ, const char *request, size_t request_len) { crypt_path_t *hop; char keys[DIGEST_LEN+CPATH_KEY_MATERIAL_LEN]; |