diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2013-10-18 15:51:20 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2013-10-28 11:12:27 +0100 |
| commit | ef9a8bf05328d290f82613037f5419f0d5e87eb5 (patch) | |
| tree | d62db6bc2e7f60547fa7bdeb98af3f38ea00935a /client/application.cpp | |
| parent | 1b6ced7ddafd1bc6e490af091427327b05c96b3f (diff) | |
| download | spice-ef9a8bf05328d290f82613037f5419f0d5e87eb5.tar.gz spice-ef9a8bf05328d290f82613037f5419f0d5e87eb5.tar.xz spice-ef9a8bf05328d290f82613037f5419f0d5e87eb5.zip | |
Remove tunneling support
It's depending on an unmaintained package (slirp), and I don't
think anyone uses that code. It's not tested upstream nor in fedora,
so let's remove it.
Diffstat (limited to 'client/application.cpp')
| -rw-r--r-- | client/application.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/client/application.cpp b/client/application.cpp index 89026429..cdce86d7 100644 --- a/client/application.cpp +++ b/client/application.cpp @@ -43,9 +43,6 @@ #include "red_gl_canvas.h" #endif #include "cmd_line_parser.h" -#ifdef USE_TUNNEL -#include "tunnel_channel.h" -#endif #ifdef USE_GUI #include "gui/gui.h" #endif @@ -1960,9 +1957,6 @@ bool Application::set_channels_security(CmdLineParser& parser, bool on, char *va channels_names["cursor"] = SPICE_CHANNEL_CURSOR; channels_names["playback"] = SPICE_CHANNEL_PLAYBACK; channels_names["record"] = SPICE_CHANNEL_RECORD; -#ifdef USE_TUNNEL - channels_names["tunnel"] = SPICE_CHANNEL_TUNNEL; -#endif #ifdef USE_SMARTCARD channels_names["smartcard"] = SPICE_CHANNEL_SMARTCARD; #endif @@ -2133,9 +2127,6 @@ bool Application::set_enable_channels(CmdLineParser& parser, bool enable, char * channels_names["cursor"] = SPICE_CHANNEL_CURSOR; channels_names["playback"] = SPICE_CHANNEL_PLAYBACK; channels_names["record"] = SPICE_CHANNEL_RECORD; -#ifdef USE_TUNNEL - channels_names["tunnel"] = SPICE_CHANNEL_TUNNEL; -#endif #ifdef USE_SMARTCARD channels_names["smartcard"] = SPICE_CHANNEL_SMARTCARD; #endif @@ -2224,11 +2215,6 @@ void Application::register_channels() _client.register_channel_factory(RecordChannel::Factory()); } -#ifdef USE_TUNNEL - if (_enabled_channels[SPICE_CHANNEL_TUNNEL]) { - _client.register_channel_factory(TunnelChannel::Factory()); - } -#endif #ifdef USE_SMARTCARD if (_enabled_channels[SPICE_CHANNEL_SMARTCARD] && _smartcard_options->enable) { smartcard_init(_smartcard_options); // throws Exception |