Ticket #20956: 0001-Convert-ControlPort-and-SocksPort-to-__ControlPort-a.patch

File 0001-Convert-ControlPort-and-SocksPort-to-__ControlPort-a.patch, 1.8 KB (added by neel, 4 years ago)

Patch to convert ControlPort and SocksPort to ControlPort and SocksPort

  • src/or/config.c

    From 59757a0e2ce04cce0081ad71dfa838b789457596 Mon Sep 17 00:00:00 2001
    From: Neel Chauhan <neel@neelc.org>
    Date: Wed, 21 Dec 2016 19:35:02 -0500
    Subject: [PATCH] Convert ControlPort and SocksPort to __ControlPort and
     __SocksPort respectively
    
    ---
     src/or/config.c | 6 ++++--
     1 file changed, 4 insertions(+), 2 deletions(-)
    
    diff --git a/src/or/config.c b/src/or/config.c
    index 7f789c49f..da9933987 100644
    a b static config_abbrev_t option_abbrevs_[] = { 
    156156  { "ORBindAddress", "ORListenAddress", 0, 0},
    157157  { "DirBindAddress", "DirListenAddress", 0, 0},
    158158  { "SocksBindAddress", "SocksListenAddress", 0, 0},
     159  { "SocksPort", "__SocksPort", 0, 0},
     160  { "ControlPort", "__ControlPort", 0, 0},
    159161  { "UseHelperNodes", "UseEntryGuards", 0, 0},
    160162  { "NumHelperNodes", "NumEntryGuards", 0, 0},
    161163  { "UseEntryNodes", "UseEntryGuards", 0, 0},
    static config_var_t option_vars_[] = { 
    253255  V(ConstrainedSockSize,         MEMUNIT,  "8192"),
    254256  V(ContactInfo,                 STRING,   NULL),
    255257  V(ControlListenAddress,        LINELIST, NULL),
    256   VPORT(ControlPort,                 LINELIST, NULL),
     258  VAR("__ControlPort",           LINELIST, ControlPort_lines, NULL),
    257259  V(ControlPortFileGroupReadable,BOOL,     "0"),
    258260  V(ControlPortWriteToFile,      FILENAME, NULL),
    259261  V(ControlSocket,               LINELIST, NULL),
    static config_var_t option_vars_[] = { 
    475477  V(ShutdownWaitLength,          INTERVAL, "30 seconds"),
    476478  V(SocksListenAddress,          LINELIST, NULL),
    477479  V(SocksPolicy,                 LINELIST, NULL),
    478   VPORT(SocksPort,                   LINELIST, NULL),
     480  VAR("__SocksPort",             LINELIST, SocksPort_lines, NULL),
    479481  V(SocksTimeout,                INTERVAL, "2 minutes"),
    480482  V(SSLKeyLifetime,              INTERVAL, "0"),
    481483  OBSOLETE("StrictEntryNodes"),