diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-12-19 22:08:42 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-12-19 22:08:42 -0500 |
| commit | c79427a9921787abab8f0d6e0c621dc974d98453 (patch) | |
| tree | 1c7c6a8e83c33c3206e675f9d161f1c1afc9ef17 /src/or/connection_or.c | |
| parent | dd2ae32bc181efdc134c25359bc67d073c48a1d0 (diff) | |
| parent | a62038f01db0df22f864623e6d82d69b447c1414 (diff) | |
| download | tor-c79427a9921787abab8f0d6e0c621dc974d98453.tar.gz tor-c79427a9921787abab8f0d6e0c621dc974d98453.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index a79c1e5079..248bffda91 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1403,7 +1403,8 @@ connection_or_write_var_cell_to_buf(const var_cell_t *cell, tor_assert(conn); var_cell_pack_header(cell, hdr); connection_write_to_buf(hdr, sizeof(hdr), TO_CONN(conn)); - connection_write_to_buf(cell->payload, cell->payload_len, TO_CONN(conn)); + connection_write_to_buf((char*)cell->payload, + cell->payload_len, TO_CONN(conn)); if (cell->command != CELL_PADDING) conn->timestamp_last_added_nonpadding = approx_time(); } @@ -1538,7 +1539,7 @@ connection_or_send_netinfo(or_connection_t *conn) time_t now = time(NULL); const routerinfo_t *me; int len; - char *out; + uint8_t *out; memset(&cell, 0, sizeof(cell_t)); cell.command = CELL_NETINFO; |