[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor/master] trunnel: Rename sendme.trunnel to sendme_cell.trunnel



commit c1359b32a43b09be96e0388c12b75a9deda17e4f
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Wed Jun 5 09:57:52 2019 -0400

    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@xxxxxxxxxxxxxx>
---
 changes/ticket30769                                 | 4 ++++
 src/core/or/sendme.c                                | 2 +-
 src/ext/trunnel/trunnel-impl.h                      | 2 +-
 src/ext/trunnel/trunnel.c                           | 2 +-
 src/ext/trunnel/trunnel.h                           | 2 +-
 src/trunnel/channelpadding_negotiation.c            | 2 +-
 src/trunnel/channelpadding_negotiation.h            | 2 +-
 src/trunnel/circpad_negotiation.c                   | 2 +-
 src/trunnel/circpad_negotiation.h                   | 2 +-
 src/trunnel/ed25519_cert.c                          | 2 +-
 src/trunnel/ed25519_cert.h                          | 2 +-
 src/trunnel/hs/cell_common.c                        | 2 +-
 src/trunnel/hs/cell_common.h                        | 2 +-
 src/trunnel/hs/cell_establish_intro.c               | 2 +-
 src/trunnel/hs/cell_establish_intro.h               | 2 +-
 src/trunnel/hs/cell_introduce1.c                    | 2 +-
 src/trunnel/hs/cell_introduce1.h                    | 2 +-
 src/trunnel/hs/cell_rendezvous.c                    | 2 +-
 src/trunnel/hs/cell_rendezvous.h                    | 2 +-
 src/trunnel/include.am                              | 6 +++---
 src/trunnel/link_handshake.c                        | 2 +-
 src/trunnel/link_handshake.h                        | 2 +-
 src/trunnel/netinfo.c                               | 2 +-
 src/trunnel/netinfo.h                               | 2 +-
 src/trunnel/pwbox.c                                 | 2 +-
 src/trunnel/pwbox.h                                 | 2 +-
 src/trunnel/{sendme.c => sendme_cell.c}             | 8 ++++----
 src/trunnel/{sendme.h => sendme_cell.h}             | 6 +++---
 src/trunnel/{sendme.trunnel => sendme_cell.trunnel} | 0
 src/trunnel/socks5.c                                | 2 +-
 src/trunnel/socks5.h                                | 2 +-
 31 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/changes/ticket30769 b/changes/ticket30769
new file mode 100644
index 000000000..74f63a146
--- /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 47ac95f3c..0757ce3d5 100644
--- 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 15d1c8633..52afa9ccd 100644
--- 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 3ae3fe02c..01a55c5be 100644
--- 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 9b708437b..87c75f4ec 100644
--- 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 59e6b3838..d96496e90 100644
--- 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 fcfc232fe..3f96174f6 100644
--- 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 236be06ad..547818f2e 100644
--- 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 d09080dc1..ba9155019 100644
--- 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 1276c7a50..86b79ef9b 100644
--- 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 e086c6fce..bd91ce105 100644
--- 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 af223560c..830af5c78 100644
--- 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 e08eedfdb..c84d17d8e 100644
--- 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 ae3b7b1bc..99ceadbda 100644
--- 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 ccaef5488..1908645aa 100644
--- 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 53b3d299f..016c9fa8d 100644
--- 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 986a531ca..8dabff3cb 100644
--- 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 53cb60913..1204e93cf 100644
--- 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 39e14da25..5a8c2ff52 100644
--- 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 ce15570b1..6c3a5ff06 100644
--- 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 03ead31c6..76db4b0e2 100644
--- 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 6a23483ad..0c7ac36b1 100644
--- 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 5d815b9b1..d7d0cddc8 100644
--- 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 ac46e603b..37c2ae3c2 100644
--- 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 c356515d3..c159a5e68 100644
--- 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 a9a421408..36d595f4e 100644
--- 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 262b91523..b9f8fe967 100644
--- 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 f3c3dd78c..45efb9f10 100644
--- 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 057a52b04..f32862e35 100644
--- 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 d3bea152e..23ac64fab 100644
--- 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.
  */



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits