Skip to content

Commit 4787eb6

Browse files
committed
Revert "lightningd: add dev-uniform-padding flag to lightningd"
This reverts commit 5cb8ac4.
1 parent 92c59ec commit 4787eb6

6 files changed

Lines changed: 4 additions & 18 deletions

File tree

connectd/connectd.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,9 +1689,8 @@ static void connect_init(struct daemon *daemon, const u8 *msg)
16891689
&dev_throttle_gossip,
16901690
&daemon->dev_no_reconnect,
16911691
&daemon->dev_fast_reconnect,
1692-
&dev_limit_connections_inflight,
1693-
&daemon->dev_keep_nagle,
1694-
&daemon->dev_uniform_padding)) {
1692+
&dev_limit_connections_inflight,
1693+
&daemon->dev_keep_nagle)) {
16951694
/* This is a helper which prints the type expected and the actual
16961695
* message, then exits (it should never be called!). */
16971696
master_badmsg(WIRE_CONNECTD_INIT, msg);
@@ -2566,7 +2565,6 @@ int main(int argc, char *argv[])
25662565
daemon->dev_exhausted_fds = false;
25672566
daemon->dev_lightningd_is_slow = false;
25682567
daemon->dev_keep_nagle = false;
2569-
daemon->dev_uniform_padding = false;
25702568
/* We generally allow 1MB per second per peer, except for dev testing */
25712569
daemon->gossip_stream_limit = 1000000;
25722570
daemon->scid_htable = new_htable(daemon, scid_htable);

connectd/connectd.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,6 @@ struct daemon {
309309
/* Allow localhost to be considered "public", only with --developer */
310310
bool dev_allow_localhost;
311311

312-
/* Pad outgoing messages to uniform 1460-byte segments (traffic analysis defence) */
313-
bool dev_uniform_padding;
314-
315312
/* How much to gossip allow a peer every 60 seconds (bytes) */
316313
size_t gossip_stream_limit;
317314

lightningd/connect_control.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -726,9 +726,8 @@ int connectd_init(struct lightningd *ld)
726726
ld->dev_throttle_gossip,
727727
!ld->reconnect,
728728
ld->dev_fast_reconnect,
729-
ld->dev_limit_connections_inflight,
730-
ld->dev_keep_nagle,
731-
ld->dev_uniform_padding);
729+
ld->dev_limit_connections_inflight,
730+
ld->dev_keep_nagle);
732731

733732
subd_req(ld->connectd, ld->connectd, take(msg), -1, 0,
734733
connect_init_done, NULL);

lightningd/lightningd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ static struct lightningd *new_lightningd(const tal_t *ctx)
150150
ld->dev_strict_forwarding = false;
151151
ld->dev_limit_connections_inflight = false;
152152
ld->dev_keep_nagle = false;
153-
ld->dev_uniform_padding = false;
154153

155154
/*~ We try to ensure enough fds for twice the number of channels
156155
* we start with. We have a developer option to change that factor

lightningd/lightningd.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,6 @@ struct lightningd {
369369
/* Tell connectd we don't want TCP_NODELAY */
370370
bool dev_keep_nagle;
371371

372-
/* Pad outgoing messages to uniform 1460-byte segments (traffic analysis defence) */
373-
bool dev_uniform_padding;
374-
375372
/* tor support */
376373
struct wireaddr *proxyaddr;
377374
bool always_use_proxy;

lightningd/options.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -952,10 +952,6 @@ static void dev_register_opts(struct lightningd *ld)
952952
opt_set_bool,
953953
&ld->dev_keep_nagle,
954954
"Tell connectd not to set TCP_NODELAY.");
955-
clnopt_noarg("--dev-uniform-padding", OPT_DEV,
956-
opt_set_bool,
957-
&ld->dev_uniform_padding,
958-
"Pad all outgoing peer messages to uniform 1460-byte segments");
959955
/* This is handled directly in daemon_developer_mode(), so we ignore it here */
960956
clnopt_noarg("--dev-debug-self", OPT_DEV,
961957
opt_ignore,

0 commit comments

Comments
 (0)