[tor-commits] [tor/master] Rename socks5 error code setting function again

nickm at torproject.org nickm at torproject.org
Mon Sep 29 13:18:07 UTC 2014


commit fcebc8da95af5ccb28d715a6897566ea1c190a03
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 29 09:17:20 2014 -0400

    Rename socks5 error code setting function again
    
    I'd prefer not to use the name "send" for any function that doesn't
    really send things.
---
 src/or/buffers.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index edb64ec..d174f81 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -55,7 +55,7 @@
  * forever.
  */
 
-static void send_socks5_error(socks_request_t *req,
+static void socks_request_set_socks5_error(socks_request_t *req,
                               socks5_reply_status_t reason);
 
 static int parse_socks(const char *data, size_t datalen, socks_request_t *req,
@@ -1838,7 +1838,7 @@ fetch_ext_or_command_from_evbuffer(struct evbuffer *buf, ext_or_cmd_t **out)
  * have Tor send it as error response to <b>req</b>.
  */
 static void
-send_socks5_error(socks_request_t *req,
+socks_request_set_socks5_error(socks_request_t *req,
                   socks5_reply_status_t reason)
 {
    req->replylen = 10;
@@ -1984,7 +1984,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
           req->command != SOCKS_COMMAND_RESOLVE &&
           req->command != SOCKS_COMMAND_RESOLVE_PTR) {
         /* not a connect or resolve or a resolve_ptr? we don't support it. */
-        send_socks5_error(req,SOCKS5_COMMAND_NOT_SUPPORTED);
+        socks_request_set_socks5_error(req,SOCKS5_COMMAND_NOT_SUPPORTED);
 
         log_warn(LD_APP,"socks5: command %d not recognized. Rejecting.",
                  req->command);





More information about the tor-commits mailing list