comparison cli-runopts.c @ 575:f9b5dc0cba61

- Disable compression for non-final multihops
author Matt Johnston <matt@ucc.asn.au>
date Fri, 11 Sep 2009 14:02:04 +0000
parents b6665c1eac43
children 44f486b72427
comparison
equal deleted inserted replaced
574:b6665c1eac43 575:f9b5dc0cba61
143 cli_opts.agent_keys_loaded = 0; 143 cli_opts.agent_keys_loaded = 0;
144 #endif 144 #endif
145 #ifdef ENABLE_CLI_PROXYCMD 145 #ifdef ENABLE_CLI_PROXYCMD
146 cli_opts.proxycmd = NULL; 146 cli_opts.proxycmd = NULL;
147 #endif 147 #endif
148 #ifndef DISABLE_ZLIB
149 opts.enable_compress = 1;
150 #endif
148 /* not yet 151 /* not yet
149 opts.ipv4 = 1; 152 opts.ipv4 = 1;
150 opts.ipv6 = 1; 153 opts.ipv6 = 1;
151 */ 154 */
152 opts.recv_window = DEFAULT_RECV_WINDOW; 155 opts.recv_window = DEFAULT_RECV_WINDOW;
528 + 30; 531 + 30;
529 cli_opts.proxycmd = m_malloc(cmd_len); 532 cli_opts.proxycmd = m_malloc(cmd_len);
530 snprintf(cli_opts.proxycmd, cmd_len, "%s -B %s:%s %s %s", 533 snprintf(cli_opts.proxycmd, cmd_len, "%s -B %s:%s %s %s",
531 argv0, cli_opts.remotehost, cli_opts.remoteport, 534 argv0, cli_opts.remotehost, cli_opts.remoteport,
532 passthrough_args, remainder); 535 passthrough_args, remainder);
536 #ifndef DISABLE_ZLIB
537 /* The stream will be incompressible since it's encrypted. */
538 opts.enable_compress = 0;
539 #endif
533 m_free(passthrough_args); 540 m_free(passthrough_args);
534 } 541 }
535 m_free(hostbuf); 542 m_free(hostbuf);
536 } 543 }
537 #endif /* !ENABLE_CLI_MULTIHOP */ 544 #endif /* !ENABLE_CLI_MULTIHOP */