diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-08 15:16:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-05 13:57:51 -0400 |
| commit | 4a7e90adc5828263a5d2dc3744818f2189c04bc7 (patch) | |
| tree | 62cac4a9acefb41d9e3b9b6ee7d6501ee64efc01 /src/or/proto_control0.c | |
| parent | 336aa21e37b6c5bd4f1215ceba27c21f6c43dce7 (diff) | |
| download | tor-4a7e90adc5828263a5d2dc3744818f2189c04bc7.tar.gz tor-4a7e90adc5828263a5d2dc3744818f2189c04bc7.zip | |
Repair buffer API so everything starts with buf_.
Our convention is that functions which manipulate a type T should be
named T_foo. But the buffer functions were super old, and followed
all kinds of conventions. Now they're uniform.
Here's the perl I used to do this:
\#!/usr/bin/perl -w -i -p
s/read_to_buf\(/buf_read_from_socket\(/;
s/flush_buf\(/buf_flush_to_socket\(/;
s/read_to_buf_tls\(/buf_read_from_tls\(/;
s/flush_buf_tls\(/buf_flush_to_tls\(/;
s/write_to_buf\(/buf_add\(/;
s/write_to_buf_compress\(/buf_add_compress\(/;
s/move_buf_to_buf\(/buf_move_to_buf\(/;
s/peek_from_buf\(/buf_peek\(/;
s/fetch_from_buf\(/buf_get_bytes\(/;
s/fetch_from_buf_line\(/buf_get_line\(/;
s/fetch_from_buf_line\(/buf_get_line\(/;
s/buf_remove_from_front\(/buf_drain\(/;
s/peek_buf_startswith\(/buf_peek_startswith\(/;
s/assert_buf_ok\(/buf_assert_ok\(/;
Diffstat (limited to 'src/or/proto_control0.c')
| -rw-r--r-- | src/or/proto_control0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/proto_control0.c b/src/or/proto_control0.c index 5478d07e46..af84786489 100644 --- a/src/or/proto_control0.c +++ b/src/or/proto_control0.c @@ -16,7 +16,7 @@ peek_buf_has_control0_command(buf_t *buf) if (buf_datalen(buf) >= 4) { char header[4]; uint16_t cmd; - peek_from_buf(header, sizeof(header), buf); + buf_peek(header, sizeof(header), buf); cmd = ntohs(get_uint16(header+2)); if (cmd <= 0x14) return 1; /* This is definitely not a v1 control command. */ |