More Extended ORPort code improvements.

* Change name of init_ext_or_auth_cookie_authentication().
* Add a small comment.

diff --git a/src/or/config.c b/src/or/config.c
index 542191dbebfe1fafa5988cc2cc7db07e7be7fdae..9c1505cf880427a3550731d638e273f78d1769ee 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1481,7 +1481,7 @@ options_act(const or_options_t *old_options)
   }
 
   /* If we have an ExtORPort, initialize its auth cookie. */
-  if (init_ext_or_auth_cookie_authentication(!!options->ExtORPort_lines) < 0) {
+  if (init_ext_or_cookie_authentication(!!options->ExtORPort_lines) < 0) {
     log_warn(LD_CONFIG,"Error creating Extended ORPort cookie file.");
     return -1;
   }

diff --git a/src/or/connection.c b/src/or/connection.c
index fcdc9ab996a4b929c8ac8aaf0ac088c22f0d5d0d..6f66f797bdfe7248ae901ba1691b312776ff7831 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1406,6 +1406,7 @@ connection_init_accepted_conn(connection_t *conn,
 
   switch (conn->type) {
     case CONN_TYPE_EXT_OR:
+      /* Initiate Extended ORPort authentication. */
       return connection_ext_or_start_auth(TO_OR_CONN(conn));
     case CONN_TYPE_OR:
       control_event_or_conn_status(TO_OR_CONN(conn), OR_CONN_EVENT_NEW, 0);

diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c
index 18ee5ab65185228d303a6cdfedbc2f2a868a488e..f44a3f5d516430cb5f83ab4d218fd2c81534590f 100644 (file)
--- a/src/or/ext_orport.c
+++ b/src/or/ext_orport.c
@@ -128,7 +128,7 @@ get_ext_or_auth_cookie_file(void)
  * authorized to use the control connection. Return -1 if we can't
  * write the file, or 0 on success. */
 int
-init_ext_or_auth_cookie_authentication(int is_enabled)
+init_ext_or_cookie_authentication(int is_enabled)
 {
   char *fname;
   char cookie_file_string[EXT_OR_PORT_AUTH_COOKIE_FILE_LEN];

diff --git a/src/or/ext_orport.h b/src/or/ext_orport.h
index fbd7ed653730cf02f0c97eff1256cab925a559ce..a7038b91887472a97f2e2c60ea46c59893e5835c 100644 (file)
--- a/src/or/ext_orport.h
+++ b/src/or/ext_orport.h
@@ -9,6 +9,6 @@ void connection_or_clear_ext_or_id_map(void);
 int connection_ext_or_finished_flushing(or_connection_t *conn);
 int connection_ext_or_process_inbuf(or_connection_t *or_conn);
 
-int init_ext_or_auth_cookie_authentication(int is_enabled);
+int init_ext_or_cookie_authentication(int is_enabled);
 char *get_ext_or_auth_cookie_file(void);