nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ticket30769_041_01'

Browse Source
This commit is contained in:
George Kadianakis 2019-06-11 14:11:24 +03:00
commit e5ad6fb092
31 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket30769 Normal file
View File

@ -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.

2
src/core/or/sendme.c
View File

@ -23,7 +23,7 @@
#include "core/or/sendme.h" #include "core/or/sendme.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "lib/ctime/di_ops.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 /* Return the minimum version given by the consensus (if any) that should be
* used when emitting a SENDME cell. */ * used when emitting a SENDME cell. */

2
src/ext/trunnel/trunnel-impl.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/ext/trunnel/trunnel.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/ext/trunnel/trunnel.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/channelpadding_negotiation.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/channelpadding_negotiation.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/circpad_negotiation.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/circpad_negotiation.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/ed25519_cert.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/ed25519_cert.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/hs/cell_common.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/hs/cell_common.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/hs/cell_establish_intro.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/hs/cell_establish_intro.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/hs/cell_introduce1.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/hs/cell_introduce1.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/hs/cell_rendezvous.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/hs/cell_rendezvous.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

6
src/trunnel/include.am
View File

@ -11,7 +11,7 @@ TRUNNELINPUTS = \
src/trunnel/link_handshake.trunnel \ src/trunnel/link_handshake.trunnel \
src/trunnel/pwbox.trunnel \ src/trunnel/pwbox.trunnel \
src/trunnel/channelpadding_negotiation.trunnel \ src/trunnel/channelpadding_negotiation.trunnel \
src/trunnel/sendme.trunnel \ src/trunnel/sendme_cell.trunnel \
src/trunnel/socks5.trunnel \ src/trunnel/socks5.trunnel \
src/trunnel/circpad_negotiation.trunnel src/trunnel/circpad_negotiation.trunnel
@ -25,7 +25,7 @@ TRUNNELSOURCES = \
src/trunnel/hs/cell_introduce1.c \ src/trunnel/hs/cell_introduce1.c \
src/trunnel/hs/cell_rendezvous.c \ src/trunnel/hs/cell_rendezvous.c \
src/trunnel/channelpadding_negotiation.c \ src/trunnel/channelpadding_negotiation.c \
src/trunnel/sendme.c \ src/trunnel/sendme_cell.c \
src/trunnel/socks5.c \ src/trunnel/socks5.c \
src/trunnel/netinfo.c \ src/trunnel/netinfo.c \
src/trunnel/circpad_negotiation.c src/trunnel/circpad_negotiation.c
@ -42,7 +42,7 @@ TRUNNELHEADERS = \
src/trunnel/hs/cell_introduce1.h \ src/trunnel/hs/cell_introduce1.h \
src/trunnel/hs/cell_rendezvous.h \ src/trunnel/hs/cell_rendezvous.h \
src/trunnel/channelpadding_negotiation.h \ src/trunnel/channelpadding_negotiation.h \
src/trunnel/sendme.h \ src/trunnel/sendme_cell.h \
src/trunnel/socks5.h \ src/trunnel/socks5.h \
src/trunnel/netinfo.h \ src/trunnel/netinfo.h \
src/trunnel/circpad_negotiation.h src/trunnel/circpad_negotiation.h

2
src/trunnel/link_handshake.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/link_handshake.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/netinfo.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/netinfo.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/pwbox.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/pwbox.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

8
src/trunnel/sendme.c → src/trunnel/sendme_cell.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */
#include <stdlib.h> #include <stdlib.h>
#include "trunnel-impl.h" #include "trunnel-impl.h"
#include "sendme.h" #include "sendme_cell.h"
#define TRUNNEL_SET_ERROR_CODE(obj) \ #define TRUNNEL_SET_ERROR_CODE(obj) \
do { \ do { \
@ -15,8 +15,8 @@
#if defined(__COVERITY__) || defined(__clang_analyzer__) #if defined(__COVERITY__) || defined(__clang_analyzer__)
/* If we're running a static analysis tool, we don't want it to complain /* 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. */ * that some of our remaining-bytes checks are dead-code. */
int sendme_deadcode_dummy__ = 0; int sendmecell_deadcode_dummy__ = 0;
#define OR_DEADCODE_DUMMY || sendme_deadcode_dummy__ #define OR_DEADCODE_DUMMY || sendmecell_deadcode_dummy__
#else #else
#define OR_DEADCODE_DUMMY #define OR_DEADCODE_DUMMY
#endif #endif

6
src/trunnel/sendme.h → src/trunnel/sendme_cell.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */
#ifndef TRUNNEL_SENDME_H #ifndef TRUNNEL_SENDME_CELL_H
#define TRUNNEL_SENDME_H #define TRUNNEL_SENDME_CELL_H
#include <stdint.h> #include <stdint.h>
#include "trunnel.h" #include "trunnel.h"

0
src/trunnel/sendme.trunnel → src/trunnel/sendme_cell.trunnel
View File

2
src/trunnel/socks5.c
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */

2
src/trunnel/socks5.h
View File

@ -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 * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */