trunnel: Rename sendme.trunnel to sendme_cell.trunnel

This is to avoid having two sendme.{c|h} in the repository since the subsystem
is implemented in src/core/or/sendme.{c|h}.

Fixes #30769

Signed-off-by: David Goulet <dgoulet@torproject.org>

diff --git a/changes/ticket30769 b/changes/ticket30769
new file mode 100644 (file)
index 0000000..74f63a1
--- /dev/null
+++ b/changes/ticket30769
@@ -0,0 +1,4 @@
+  o Minor bugfixes (sendme, code structure):
+    - Rename the trunnel SENDME file definition from sendme.trunnel to
+      sendme_cell.trunnel to avoid having twice sendme.{c|h} in the repository.
+      Fixes bug 30769; bugfix on 0.4.1.1-alpha.

diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c
index 47ac95f3cff61bf203d24d4027e30f982ac88ed9..0757ce3d5294089aa143e83a0b57012cbd157da7 100644 (file)
--- a/src/core/or/sendme.c
+++ b/src/core/or/sendme.c
@@ -23,7 +23,7 @@
 #include "core/or/sendme.h"
 #include "feature/nodelist/networkstatus.h"
 #include "lib/ctime/di_ops.h"
-#include "trunnel/sendme.h"
+#include "trunnel/sendme_cell.h"
 
 /* Return the minimum version given by the consensus (if any) that should be
  * used when emitting a SENDME cell. */

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index 15d1c8633ee38ef5cd80fe1ef9ccb98cab9119d4..52afa9ccd446813f9b7e6b8c5648e0b8f1901165 100644 (file)
--- a/src/ext/trunnel/trunnel-impl.h
+++ b/src/ext/trunnel/trunnel-impl.h
@@ -1,4 +1,4 @@
-/* trunnel-impl.h -- copied from Trunnel v1.5.2
+/* trunnel-impl.h -- copied from Trunnel v1.5.3
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index 3ae3fe02c8bbfbafa5d380d2d8564a2bc53eceab..01a55c5beca32e03e200bfeaffb53b3d0460d03b 100644 (file)
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,4 +1,4 @@
-/* trunnel.c -- copied from Trunnel v1.5.2
+/* trunnel.c -- copied from Trunnel v1.5.3
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h
index 9b708437b8bd0bb9cf6799a73285e79aab42479e..87c75f4ec3ab22edda4953b628e54be3689dc673 100644 (file)
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,4 +1,4 @@
-/* trunnel.h -- copied from Trunnel v1.5.2
+/* trunnel.h -- copied from Trunnel v1.5.3
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/channelpadding_negotiation.c b/src/trunnel/channelpadding_negotiation.c
index 59e6b3838490b940847e116d74285a44b861445e..d96496e90c56941e841f4ac17e0d0c1c51cdabd5 100644 (file)
--- a/src/trunnel/channelpadding_negotiation.c
+++ b/src/trunnel/channelpadding_negotiation.c
@@ -1,4 +1,4 @@
-/* channelpadding_negotiation.c -- generated by Trunnel v1.5.2.
+/* channelpadding_negotiation.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/channelpadding_negotiation.h b/src/trunnel/channelpadding_negotiation.h
index fcfc232feaeb48de6224b9e0afb9381184016be3..3f96174f684bb4c41c70329c0efec8c425bf488e 100644 (file)
--- a/src/trunnel/channelpadding_negotiation.h
+++ b/src/trunnel/channelpadding_negotiation.h
@@ -1,4 +1,4 @@
-/* channelpadding_negotiation.h -- generated by Trunnel v1.5.2.
+/* channelpadding_negotiation.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/circpad_negotiation.c b/src/trunnel/circpad_negotiation.c
index 236be06adaab24db2547605641983d5fe8ba0713..547818f2ece961eece75b2aa53782dc0b7183b1e 100644 (file)
--- a/src/trunnel/circpad_negotiation.c
+++ b/src/trunnel/circpad_negotiation.c
@@ -1,4 +1,4 @@
-/* circpad_negotiation.c -- generated by Trunnel v1.5.2.
+/* circpad_negotiation.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/circpad_negotiation.h b/src/trunnel/circpad_negotiation.h
index d09080dc1679167b5d66b970f1b067c7da916c36..ba9155019ee679366100fb6f795c9f9660dc3b8a 100644 (file)
--- a/src/trunnel/circpad_negotiation.h
+++ b/src/trunnel/circpad_negotiation.h
@@ -1,4 +1,4 @@
-/* circpad_negotiation.h -- generated by Trunnel v1.5.2.
+/* circpad_negotiation.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/ed25519_cert.c b/src/trunnel/ed25519_cert.c
index 1276c7a5052ea553ed9a65de6e49399b87d32192..86b79ef9b6970e4ad930b73feedb03ad000f15d2 100644 (file)
--- a/src/trunnel/ed25519_cert.c
+++ b/src/trunnel/ed25519_cert.c
@@ -1,4 +1,4 @@
-/* ed25519_cert.c -- generated by Trunnel v1.5.2.
+/* ed25519_cert.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h
index e086c6fcedc050bc3d392305f33d944562626413..bd91ce1055086a87d772c9550abaa9f4e097b667 100644 (file)
--- a/src/trunnel/ed25519_cert.h
+++ b/src/trunnel/ed25519_cert.h
@@ -1,4 +1,4 @@
-/* ed25519_cert.h -- generated by Trunnel v1.5.2.
+/* ed25519_cert.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_common.c b/src/trunnel/hs/cell_common.c
index af223560c1083f51fda9add88acd1f9ade3e1be2..830af5c78baaf31f8410025db7989b7eab9d9490 100644 (file)
--- a/src/trunnel/hs/cell_common.c
+++ b/src/trunnel/hs/cell_common.c
@@ -1,4 +1,4 @@
-/* cell_common.c -- generated by Trunnel v1.5.2.
+/* cell_common.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_common.h b/src/trunnel/hs/cell_common.h
index e08eedfdb3b57e220ad101ff7f46be2be7e934ac..c84d17d8e530d17ef77015757980be0d0db8dfe5 100644 (file)
--- a/src/trunnel/hs/cell_common.h
+++ b/src/trunnel/hs/cell_common.h
@@ -1,4 +1,4 @@
-/* cell_common.h -- generated by Trunnel v1.5.2.
+/* cell_common.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_establish_intro.c b/src/trunnel/hs/cell_establish_intro.c
index ae3b7b1bc8fe5cf14768daa991d6dddd968f18cc..99ceadbda4f72591334e97c278c22a113e945585 100644 (file)
--- a/src/trunnel/hs/cell_establish_intro.c
+++ b/src/trunnel/hs/cell_establish_intro.c
@@ -1,4 +1,4 @@
-/* cell_establish_intro.c -- generated by Trunnel v1.5.2.
+/* cell_establish_intro.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_establish_intro.h b/src/trunnel/hs/cell_establish_intro.h
index ccaef5488c18f49bf62b374afa0b56058d73186e..1908645aa64c8a4571b8c1da268834c45ec5cc8b 100644 (file)
--- a/src/trunnel/hs/cell_establish_intro.h
+++ b/src/trunnel/hs/cell_establish_intro.h
@@ -1,4 +1,4 @@
-/* cell_establish_intro.h -- generated by Trunnel v1.5.2.
+/* cell_establish_intro.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_introduce1.c b/src/trunnel/hs/cell_introduce1.c
index 53b3d299f2583becc14b9723c6f89a6cd8d3b8df..016c9fa8d6f57745ca0ff6b4eea0b19eae9c213b 100644 (file)
--- a/src/trunnel/hs/cell_introduce1.c
+++ b/src/trunnel/hs/cell_introduce1.c
@@ -1,4 +1,4 @@
-/* cell_introduce1.c -- generated by Trunnel v1.5.2.
+/* cell_introduce1.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_introduce1.h b/src/trunnel/hs/cell_introduce1.h
index 986a531ca733a654f2d1958ef2db19e66ca86a7c..8dabff3cb5f1134b949e0980dc22c4c613c93da4 100644 (file)
--- a/src/trunnel/hs/cell_introduce1.h
+++ b/src/trunnel/hs/cell_introduce1.h
@@ -1,4 +1,4 @@
-/* cell_introduce1.h -- generated by Trunnel v1.5.2.
+/* cell_introduce1.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_rendezvous.c b/src/trunnel/hs/cell_rendezvous.c
index 53cb609138383d55c01db7fa8f1d311e1ab31957..1204e93cfcb385b3718e48c3f52b6aa48aad6170 100644 (file)
--- a/src/trunnel/hs/cell_rendezvous.c
+++ b/src/trunnel/hs/cell_rendezvous.c
@@ -1,4 +1,4 @@
-/* cell_rendezvous.c -- generated by Trunnel v1.5.2.
+/* cell_rendezvous.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_rendezvous.h b/src/trunnel/hs/cell_rendezvous.h
index 39e14da25b6b79f1dc0cbf0c3fadb8bf4758d4b2..5a8c2ff52ac3cfc3c60e27c257dbecebc60de3b6 100644 (file)
--- a/src/trunnel/hs/cell_rendezvous.h
+++ b/src/trunnel/hs/cell_rendezvous.h
@@ -1,4 +1,4 @@
-/* cell_rendezvous.h -- generated by Trunnel v1.5.2.
+/* cell_rendezvous.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/include.am b/src/trunnel/include.am
index ce15570b157351ab7d86e136d29c98c00bfd6e5d..6c3a5ff06b92569e355a8ab65f36b190a5192171 100644 (file)
--- a/src/trunnel/include.am
+++ b/src/trunnel/include.am
@@ -11,7 +11,7 @@ TRUNNELINPUTS = \
        src/trunnel/link_handshake.trunnel \
        src/trunnel/pwbox.trunnel \
        src/trunnel/channelpadding_negotiation.trunnel \
-       src/trunnel/sendme.trunnel \
+       src/trunnel/sendme_cell.trunnel \
        src/trunnel/socks5.trunnel \
        src/trunnel/circpad_negotiation.trunnel
 
@@ -25,7 +25,7 @@ TRUNNELSOURCES = \
        src/trunnel/hs/cell_introduce1.c \
        src/trunnel/hs/cell_rendezvous.c \
        src/trunnel/channelpadding_negotiation.c \
-       src/trunnel/sendme.c                    \
+       src/trunnel/sendme_cell.c                    \
        src/trunnel/socks5.c \
        src/trunnel/netinfo.c \
        src/trunnel/circpad_negotiation.c
@@ -42,7 +42,7 @@ TRUNNELHEADERS = \
        src/trunnel/hs/cell_introduce1.h \
        src/trunnel/hs/cell_rendezvous.h \
        src/trunnel/channelpadding_negotiation.h \
-       src/trunnel/sendme.h                    \
+       src/trunnel/sendme_cell.h                    \
        src/trunnel/socks5.h                    \
        src/trunnel/netinfo.h \
        src/trunnel/circpad_negotiation.h

diff --git a/src/trunnel/link_handshake.c b/src/trunnel/link_handshake.c
index 03ead31c6268d6903c739c5e1a8cd40daade7f89..76db4b0e292881736bb33080a6c12e6d1a06afc1 100644 (file)
--- a/src/trunnel/link_handshake.c
+++ b/src/trunnel/link_handshake.c
@@ -1,4 +1,4 @@
-/* link_handshake.c -- generated by Trunnel v1.5.2.
+/* link_handshake.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/link_handshake.h b/src/trunnel/link_handshake.h
index 6a23483adcb1311c6f6ecef3a10573f777526e5b..0c7ac36b1b949a74a122797a682cfc76066def14 100644 (file)
--- a/src/trunnel/link_handshake.h
+++ b/src/trunnel/link_handshake.h
@@ -1,4 +1,4 @@
-/* link_handshake.h -- generated by Trunnel v1.5.2.
+/* link_handshake.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/netinfo.c b/src/trunnel/netinfo.c
index 5d815b9b1206633b6d1b5fda42c496eed36ec751..d7d0cddc8939be0c950b2aee731f7e3b0231f194 100644 (file)
--- a/src/trunnel/netinfo.c
+++ b/src/trunnel/netinfo.c
@@ -1,4 +1,4 @@
-/* netinfo.c -- generated by Trunnel v1.5.2.
+/* netinfo.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/netinfo.h b/src/trunnel/netinfo.h
index ac46e603baa1e2f5e59257ca7a4b1b3bc96a8c52..37c2ae3c2d2644246aa34a40ae5d9f7276296bbb 100644 (file)
--- a/src/trunnel/netinfo.h
+++ b/src/trunnel/netinfo.h
@@ -1,4 +1,4 @@
-/* netinfo.h -- generated by Trunnel v1.5.2.
+/* netinfo.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c
index c356515d36ad7f8f4ca278e3f1ac26943d878fe1..c159a5e6871e373c49c5aa05dd22e4d0201a1390 100644 (file)
--- a/src/trunnel/pwbox.c
+++ b/src/trunnel/pwbox.c
@@ -1,4 +1,4 @@
-/* pwbox.c -- generated by Trunnel v1.5.2.
+/* pwbox.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h
index a9a421408a5b5fa30fa20a1df224bff0438714fc..36d595f4effa90c0a819af480ac894ed136a484b 100644 (file)
--- a/src/trunnel/pwbox.h
+++ b/src/trunnel/pwbox.h
@@ -1,4 +1,4 @@
-/* pwbox.h -- generated by Trunnel v1.5.2.
+/* pwbox.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/sendme.c b/src/trunnel/sendme_cell.c
similarity index 97%
rename from src/trunnel/sendme.c
rename to src/trunnel/sendme_cell.c
index 262b9152348c354fc982c848c92855602e459580..b9f8fe967f41323150b6ac5edb43f6e00d226468 100644 (file)
--- a/src/trunnel/sendme.c
+++ b/src/trunnel/sendme_cell.c
@@ -1,11 +1,11 @@
-/* sendme.c -- generated by Trunnel v1.5.2.
+/* sendme_cell.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
 #include <stdlib.h>
 #include "trunnel-impl.h"
 
-#include "sendme.h"
+#include "sendme_cell.h"
 
 #define TRUNNEL_SET_ERROR_CODE(obj) \
   do {                              \
@@ -15,8 +15,8 @@
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
 /* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
-int sendme_deadcode_dummy__ = 0;
-#define OR_DEADCODE_DUMMY || sendme_deadcode_dummy__
+int sendmecell_deadcode_dummy__ = 0;
+#define OR_DEADCODE_DUMMY || sendmecell_deadcode_dummy__
 #else
 #define OR_DEADCODE_DUMMY
 #endif

diff --git a/src/trunnel/sendme.h b/src/trunnel/sendme_cell.h
similarity index 97%
rename from src/trunnel/sendme.h
rename to src/trunnel/sendme_cell.h
index f3c3dd78c40542ae161a1974b355597422cce36f..45efb9f10dc206d758316e459ef77baf5dff5f6f 100644 (file)
--- a/src/trunnel/sendme.h
+++ b/src/trunnel/sendme_cell.h
@@ -1,9 +1,9 @@
-/* sendme.h -- generated by Trunnel v1.5.2.
+/* sendme_cell.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
-#ifndef TRUNNEL_SENDME_H
-#define TRUNNEL_SENDME_H
+#ifndef TRUNNEL_SENDME_CELL_H
+#define TRUNNEL_SENDME_CELL_H
 
 #include <stdint.h>
 #include "trunnel.h"

diff --git a/src/trunnel/sendme.trunnel b/src/trunnel/sendme_cell.trunnel
similarity index 100%
rename from src/trunnel/sendme.trunnel
rename to src/trunnel/sendme_cell.trunnel

diff --git a/src/trunnel/socks5.c b/src/trunnel/socks5.c
index 057a52b0425c374ab9f2a8fc58a3969eb222d2f6..f32862e353dea4360bc4764b931e2c7b47b83a84 100644 (file)
--- a/src/trunnel/socks5.c
+++ b/src/trunnel/socks5.c
@@ -1,4 +1,4 @@
-/* socks5.c -- generated by Trunnel v1.5.2.
+/* socks5.c -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/socks5.h b/src/trunnel/socks5.h
index d3bea152e76b7e59dd2b82c54d6e35d8a85db229..23ac64faba99e9942b4184f561925a09cc57bfef 100644 (file)
--- a/src/trunnel/socks5.h
+++ b/src/trunnel/socks5.h
@@ -1,4 +1,4 @@
-/* socks5.h -- generated by Trunnel v1.5.2.
+/* socks5.h -- generated by Trunnel v1.5.3.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */