tor

commit dba00ebf3435848d95ca58f78078b2e0378f8af1
parent 6512c6b4629c8b9979865eb5125dd47a9506306f
Author: Alexander Hansen Færøy <ahf@torproject.org>
Date:   Mon, 12 Jan 2026 16:21:56 +0100

Merge branch 'minor-049' into 'main'

minor log syntax fixes + stale function documentation

See merge request tpo/core/tor!968
Diffstat:
M
src/core/or/connection_edge.c
 | 
8
++++----
M
src/core/or/onion.c
 | 
2
+-
M
src/feature/hs/hs_service.c
 | 
5
++---

3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
@@ -2205,7 +2205,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
       /* Whoops; this one is stale.  It must have gotten added earlier?
        * (Probably this is not possible, since AllowDotExit no longer
        * exists.) */
-      log_warn(LD_APP,"Stale automapped address for '%s.exit'. Refusing.",
+      log_warn(LD_APP,"Stale automapped address for '%s.$fp.exit'. Refusing.",
                safe_str_client(socks->address));
       control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
                                   escaped(socks->address));
@@ -2219,7 +2219,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
     if (exit_source == ADDRMAPSRC_DNS || exit_source == ADDRMAPSRC_NONE) {
       /* It shouldn't be possible to get a .exit address from any of these
        * sources. */
-      log_warn(LD_BUG,"Address '%s.exit', with impossible source for the "
+      log_warn(LD_BUG,"Address '%s.$fp.exit', with impossible source for the "
                ".exit part. Refusing.",
                safe_str_client(socks->address));
       control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
@@ -2272,7 +2272,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
     /* Now make sure that the chosen exit exists... */
     if (!node) {
       log_warn(LD_APP,
-               "Unrecognized relay in exit address '%s.exit'. Refusing.",
+               "Unrecognized relay in exit address '%s.$fp.exit'. Refusing.",
                safe_str_client(socks->address));
       connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
       return -1;
@@ -2280,7 +2280,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
     /* ...and make sure that it isn't excluded. */
     if (routerset_contains_node(excludeset, node)) {
       log_warn(LD_APP,
-               "Excluded relay in exit address '%s.exit'. Refusing.",
+               "Excluded relay in exit address '%s.$fp.exit'. Refusing.",
                safe_str_client(socks->address));
       connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
       return -1;
diff --git a/src/core/or/onion.c b/src/core/or/onion.c
@@ -401,7 +401,7 @@ check_extended_cell(const extended_cell_t *cell)
 }
 
 /** Parse an EXTENDED or EXTENDED2 cell (according to <b>command</b>) from the
- * <b>payload_length</b> bytes of <b>payload</b> into <b>cell_out</b>. Return
+ * <b>payload_len</b> bytes of <b>payload</b> into <b>cell_out</b>. Return
  * 0 on success, -1 on failure. */
 int
 extended_cell_parse(extended_cell_t *cell_out,
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
@@ -3264,9 +3264,8 @@ set_descriptor_revision_counter(hs_service_descriptor_t *hs_desc, time_t now,
 }
 
 /** Encode and sign the service descriptor desc and upload it to the
- * responsible hidden service directories. If for_next_period is true, the set
- * of directories are selected using the next hsdir_index. This does nothing
- * if PublishHidServDescriptors is false. */
+ * responsible hidden service directories.
+ * This does nothing if PublishHidServDescriptors is false. */
 STATIC void
 upload_descriptor_to_all(const hs_service_t *service,
                          hs_service_descriptor_t *desc)