[tor-commits] [obfsproxy/master] Remove is_initiator from generic protocol params

[nickm at torproject.org]

commit 78dfe6c9af14ccf42597176227af43e29aecbb67
Author: Zack Weinberg <zackw at panix.com>
Date:   Sun Jul 24 12:46:49 2011 -0700

    Remove is_initiator from generic protocol params
---
 src/protocol.h        |    1 -
 src/protocols/obfs2.c |    4 +---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/protocol.h b/src/protocol.h
index 476d447..06dec08 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -26,7 +26,6 @@ typedef struct protocol_params_t {
   size_t shared_secret_len;
   size_t target_address_len;
   size_t listen_address_len;
-  int is_initiator;
   int mode;
 } protocol_params_t;
 
diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c
index 6688ebf..88d750f 100644
--- a/src/protocols/obfs2.c
+++ b/src/protocols/obfs2.c
@@ -102,8 +102,6 @@ parse_and_set_options(int n_options, const char *const *options,
     }
     options++;
 
-    params->is_initiator = (params->mode != LSN_SIMPLE_SERVER);
-
     if (resolve_address_port(*options, 1, 1,
                              &params->listen_address,
                              &params->listen_address_len, defport) < 0)
@@ -249,7 +247,7 @@ obfs2_create(protocol_params_t *params)
   const char *send_pad_type;
 
   proto->state = ST_WAIT_FOR_KEY;
-  proto->we_are_initiator = params->is_initiator;
+  proto->we_are_initiator = (params->mode != LSN_SIMPLE_SERVER);
   if (proto->we_are_initiator) {
     send_pad_type = INITIATOR_PAD_TYPE;
     seed = proto->initiator_seed;