diff --git a/configure.ac b/configure.ac index d7a4e4c1..2996786c 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # AC_PREREQ([2.61]) -AC_INIT([guacamole-server], [0.9.11-incubating]) +AC_INIT([guacamole-server], [0.9.12-incubating]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) AM_SILENT_RULES([yes]) diff --git a/doc/Doxyfile b/doc/Doxyfile index 41f1a3fb..23eaf03e 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -22,7 +22,7 @@ # PROJECT_NAME = libguac -PROJECT_NUMBER = 0.9.11-incubating +PROJECT_NUMBER = 0.9.12-incubating # # Warn about undocumented parameters and return values, but do not fill output diff --git a/src/common-ssh/Makefile.am b/src/common-ssh/Makefile.am index a53f2cf6..c05f2640 100644 --- a/src/common-ssh/Makefile.am +++ b/src/common-ssh/Makefile.am @@ -23,18 +23,18 @@ ACLOCAL_AMFLAGS = -I m4 noinst_LTLIBRARIES = libguac_common_ssh.la libguac_common_ssh_la_SOURCES = \ - guac_sftp.c \ - guac_ssh.c \ - guac_ssh_buffer.c \ - guac_ssh_key.c \ - guac_ssh_user.c + buffer.c \ + sftp.c \ + ssh.c \ + key.c \ + user.c -noinst_HEADERS = \ - guac_sftp.h \ - guac_ssh.h \ - guac_ssh_buffer.h \ - guac_ssh_key.h \ - guac_ssh_user.h +noinst_HEADERS = \ + common-ssh/buffer.h \ + common-ssh/key.h \ + common-ssh/sftp.h \ + common-ssh/ssh.h \ + common-ssh/user.h libguac_common_ssh_la_CFLAGS = \ -Werror -Wall -pedantic \ diff --git a/src/common-ssh/guac_ssh_buffer.c b/src/common-ssh/buffer.c similarity index 100% rename from src/common-ssh/guac_ssh_buffer.c rename to src/common-ssh/buffer.c diff --git a/src/common-ssh/guac_ssh_buffer.h b/src/common-ssh/common-ssh/buffer.h similarity index 100% rename from src/common-ssh/guac_ssh_buffer.h rename to src/common-ssh/common-ssh/buffer.h diff --git a/src/common-ssh/guac_ssh_key.h b/src/common-ssh/common-ssh/key.h similarity index 100% rename from src/common-ssh/guac_ssh_key.h rename to src/common-ssh/common-ssh/key.h diff --git a/src/common-ssh/guac_sftp.h b/src/common-ssh/common-ssh/sftp.h similarity index 99% rename from src/common-ssh/guac_sftp.h rename to src/common-ssh/common-ssh/sftp.h index fdc1e72e..038a5773 100644 --- a/src/common-ssh/guac_sftp.h +++ b/src/common-ssh/common-ssh/sftp.h @@ -21,7 +21,7 @@ #define GUAC_COMMON_SSH_SFTP_H #include "common/json.h" -#include "guac_ssh.h" +#include "ssh.h" #include #include diff --git a/src/common-ssh/guac_ssh.h b/src/common-ssh/common-ssh/ssh.h similarity index 99% rename from src/common-ssh/guac_ssh.h rename to src/common-ssh/common-ssh/ssh.h index 36ad1762..d96ce44c 100644 --- a/src/common-ssh/guac_ssh.h +++ b/src/common-ssh/common-ssh/ssh.h @@ -20,7 +20,7 @@ #ifndef GUAC_COMMON_SSH_H #define GUAC_COMMON_SSH_H -#include "guac_ssh_user.h" +#include "user.h" #include #include diff --git a/src/common-ssh/guac_ssh_user.h b/src/common-ssh/common-ssh/user.h similarity index 99% rename from src/common-ssh/guac_ssh_user.h rename to src/common-ssh/common-ssh/user.h index eeaa4606..745728f1 100644 --- a/src/common-ssh/guac_ssh_user.h +++ b/src/common-ssh/common-ssh/user.h @@ -20,7 +20,7 @@ #ifndef GUAC_COMMON_SSH_USER_H #define GUAC_COMMON_SSH_USER_H -#include "guac_ssh_key.h" +#include "key.h" /** * Data describing an SSH user, including their credentials. diff --git a/src/common-ssh/guac_ssh_key.c b/src/common-ssh/key.c similarity index 99% rename from src/common-ssh/guac_ssh_key.c rename to src/common-ssh/key.c index 7594b842..82a32522 100644 --- a/src/common-ssh/guac_ssh_key.c +++ b/src/common-ssh/key.c @@ -19,8 +19,8 @@ #include "config.h" -#include "guac_ssh_buffer.h" -#include "guac_ssh_key.h" +#include "common-ssh/buffer.h" +#include "common-ssh/key.h" #include #include diff --git a/src/common-ssh/guac_sftp.c b/src/common-ssh/sftp.c similarity index 99% rename from src/common-ssh/guac_sftp.c rename to src/common-ssh/sftp.c index 953bfd64..4be15683 100644 --- a/src/common-ssh/guac_sftp.c +++ b/src/common-ssh/sftp.c @@ -17,8 +17,8 @@ * under the License. */ -#include "guac_sftp.h" -#include "guac_ssh.h" +#include "common-ssh/sftp.h" +#include "common-ssh/ssh.h" #include #include diff --git a/src/common-ssh/guac_ssh.c b/src/common-ssh/ssh.c similarity index 99% rename from src/common-ssh/guac_ssh.c rename to src/common-ssh/ssh.c index 97d3bbcd..e4b0d387 100644 --- a/src/common-ssh/guac_ssh.c +++ b/src/common-ssh/ssh.c @@ -17,9 +17,9 @@ * under the License. */ -#include "guac_ssh.h" -#include "guac_ssh_key.h" -#include "guac_ssh_user.h" +#include "common-ssh/key.h" +#include "common-ssh/ssh.h" +#include "common-ssh/user.h" #include #include diff --git a/src/common-ssh/guac_ssh_user.c b/src/common-ssh/user.c similarity index 97% rename from src/common-ssh/guac_ssh_user.c rename to src/common-ssh/user.c index 73319c0e..92c8d963 100644 --- a/src/common-ssh/guac_ssh_user.c +++ b/src/common-ssh/user.c @@ -17,8 +17,8 @@ * under the License. */ -#include "guac_ssh_key.h" -#include "guac_ssh_user.h" +#include "common-ssh/key.h" +#include "common-ssh/user.h" #include #include diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am index 781f8622..787dfe7a 100644 --- a/src/libguac/Makefile.am +++ b/src/libguac/Makefile.am @@ -104,7 +104,7 @@ libguac_la_CFLAGS = \ -Werror -Wall -pedantic -Iguacamole libguac_la_LDFLAGS = \ - -version-info 12:1:0 \ + -version-info 13:0:1 \ @CAIRO_LIBS@ \ @JPEG_LIBS@ \ @PNG_LIBS@ \ diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c index 2dcb401b..d12efbaa 100644 --- a/src/protocols/rdp/client.c +++ b/src/protocols/rdp/client.c @@ -27,9 +27,9 @@ #include "user.h" #ifdef ENABLE_COMMON_SSH -#include -#include -#include +#include "common-ssh/sftp.h" +#include "common-ssh/ssh.h" +#include "common-ssh/user.h" #endif #include diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c index 96dc9412..cf9be2ef 100644 --- a/src/protocols/rdp/rdp.c +++ b/src/protocols/rdp/rdp.c @@ -41,9 +41,9 @@ #include "rdp_svc.h" #ifdef ENABLE_COMMON_SSH -#include -#include -#include +#include "common-ssh/sftp.h" +#include "common-ssh/ssh.h" +#include "common-ssh/user.h" #endif #include diff --git a/src/protocols/rdp/rdp.h b/src/protocols/rdp/rdp.h index e3e33119..943155dd 100644 --- a/src/protocols/rdp/rdp.h +++ b/src/protocols/rdp/rdp.h @@ -39,9 +39,9 @@ #include #ifdef ENABLE_COMMON_SSH -#include "guac_sftp.h" -#include "guac_ssh.h" -#include "guac_ssh_user.h" +#include "common-ssh/sftp.h" +#include "common-ssh/ssh.h" +#include "common-ssh/user.h" #endif #include diff --git a/src/protocols/rdp/sftp.c b/src/protocols/rdp/sftp.c index efda47d6..ecfe35fe 100644 --- a/src/protocols/rdp/sftp.c +++ b/src/protocols/rdp/sftp.c @@ -19,7 +19,7 @@ #include "config.h" -#include "guac_sftp.h" +#include "common-ssh/sftp.h" #include "rdp.h" #include "sftp.h" diff --git a/src/protocols/ssh/client.c b/src/protocols/ssh/client.c index 13dd1c89..c0a26b9d 100644 --- a/src/protocols/ssh/client.c +++ b/src/protocols/ssh/client.c @@ -20,9 +20,9 @@ #include "config.h" #include "client.h" -#include "guac_sftp.h" +#include "common-ssh/sftp.h" #include "ssh.h" -#include "terminal.h" +#include "terminal/terminal.h" #include "user.h" #include diff --git a/src/protocols/ssh/clipboard.c b/src/protocols/ssh/clipboard.c index 72a2b6c6..0e236325 100644 --- a/src/protocols/ssh/clipboard.c +++ b/src/protocols/ssh/clipboard.c @@ -20,7 +20,7 @@ #include "config.h" #include "clipboard.h" #include "ssh.h" -#include "terminal.h" +#include "terminal/terminal.h" #include #include diff --git a/src/protocols/ssh/input.c b/src/protocols/ssh/input.c index e0267e20..95e01881 100644 --- a/src/protocols/ssh/input.c +++ b/src/protocols/ssh/input.c @@ -22,7 +22,7 @@ #include "common/cursor.h" #include "common/display.h" #include "ssh.h" -#include "terminal.h" +#include "terminal/terminal.h" #include #include diff --git a/src/protocols/ssh/sftp.c b/src/protocols/ssh/sftp.c index 9fddc30e..f4173a68 100644 --- a/src/protocols/ssh/sftp.c +++ b/src/protocols/ssh/sftp.c @@ -19,7 +19,7 @@ #include "config.h" -#include "guac_sftp.h" +#include "common-ssh/sftp.h" #include "sftp.h" #include "ssh.h" diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c index 53835c85..43e66f8b 100644 --- a/src/protocols/ssh/ssh.c +++ b/src/protocols/ssh/ssh.c @@ -20,12 +20,12 @@ #include "config.h" #include "common/recording.h" -#include "guac_sftp.h" -#include "guac_ssh.h" +#include "common-ssh/sftp.h" +#include "common-ssh/ssh.h" #include "settings.h" #include "sftp.h" #include "ssh.h" -#include "terminal.h" +#include "terminal/terminal.h" #ifdef ENABLE_SSH_AGENT #include "ssh_agent.h" diff --git a/src/protocols/ssh/ssh.h b/src/protocols/ssh/ssh.h index 44027ee8..032e9209 100644 --- a/src/protocols/ssh/ssh.h +++ b/src/protocols/ssh/ssh.h @@ -22,11 +22,11 @@ #include "config.h" -#include "guac_sftp.h" -#include "guac_ssh.h" -#include "guac_ssh_user.h" +#include "common-ssh/sftp.h" +#include "common-ssh/ssh.h" +#include "common-ssh/user.h" #include "settings.h" -#include "terminal.h" +#include "terminal/terminal.h" #ifdef ENABLE_SSH_AGENT #include "ssh_agent.h" diff --git a/src/protocols/telnet/client.c b/src/protocols/telnet/client.c index a0393223..2a53d263 100644 --- a/src/protocols/telnet/client.c +++ b/src/protocols/telnet/client.c @@ -21,7 +21,7 @@ #include "client.h" #include "settings.h" #include "telnet.h" -#include "terminal.h" +#include "terminal/terminal.h" #include "user.h" #include diff --git a/src/protocols/telnet/client.h b/src/protocols/telnet/client.h index a7141e04..8921a9f4 100644 --- a/src/protocols/telnet/client.h +++ b/src/protocols/telnet/client.h @@ -21,7 +21,7 @@ #define GUAC_TELNET__CLIENT_H #include "config.h" -#include "terminal.h" +#include "terminal/terminal.h" #include #include diff --git a/src/protocols/telnet/clipboard.c b/src/protocols/telnet/clipboard.c index 44bcf1cd..08d28b11 100644 --- a/src/protocols/telnet/clipboard.c +++ b/src/protocols/telnet/clipboard.c @@ -20,7 +20,7 @@ #include "config.h" #include "clipboard.h" #include "telnet.h" -#include "terminal.h" +#include "terminal/terminal.h" #include #include diff --git a/src/protocols/telnet/input.c b/src/protocols/telnet/input.c index bb887519..be50360c 100644 --- a/src/protocols/telnet/input.c +++ b/src/protocols/telnet/input.c @@ -19,7 +19,7 @@ #include "config.h" #include "input.h" -#include "terminal.h" +#include "terminal/terminal.h" #include "telnet.h" #include diff --git a/src/protocols/telnet/telnet.c b/src/protocols/telnet/telnet.c index 56661a43..82f6dd4d 100644 --- a/src/protocols/telnet/telnet.c +++ b/src/protocols/telnet/telnet.c @@ -20,7 +20,7 @@ #include "config.h" #include "common/recording.h" #include "telnet.h" -#include "terminal.h" +#include "terminal/terminal.h" #include #include diff --git a/src/protocols/telnet/telnet.h b/src/protocols/telnet/telnet.h index 3a48a805..8259507e 100644 --- a/src/protocols/telnet/telnet.h +++ b/src/protocols/telnet/telnet.h @@ -22,7 +22,7 @@ #include "config.h" #include "settings.h" -#include "terminal.h" +#include "terminal/terminal.h" #include diff --git a/src/protocols/telnet/user.c b/src/protocols/telnet/user.c index aab8f629..d5458e24 100644 --- a/src/protocols/telnet/user.c +++ b/src/protocols/telnet/user.c @@ -23,7 +23,7 @@ #include "input.h" #include "settings.h" #include "telnet.h" -#include "terminal.h" +#include "terminal/terminal.h" #include "user.h" #include diff --git a/src/protocols/vnc/client.c b/src/protocols/vnc/client.c index 516d93fe..00b90154 100644 --- a/src/protocols/vnc/client.c +++ b/src/protocols/vnc/client.c @@ -24,9 +24,9 @@ #include "vnc.h" #ifdef ENABLE_COMMON_SSH -#include "guac_sftp.h" -#include "guac_ssh.h" -#include "sftp.h" +#include "common-ssh/sftp.h" +#include "common-ssh/ssh.h" +#include "common-ssh/user.h" #endif #ifdef ENABLE_PULSE diff --git a/src/protocols/vnc/sftp.c b/src/protocols/vnc/sftp.c index fc90668c..e5e768ac 100644 --- a/src/protocols/vnc/sftp.c +++ b/src/protocols/vnc/sftp.c @@ -19,7 +19,7 @@ #include "config.h" -#include "guac_sftp.h" +#include "common-ssh/sftp.h" #include "sftp.h" #include "vnc.h" diff --git a/src/protocols/vnc/vnc.c b/src/protocols/vnc/vnc.c index 94941c63..8678ee29 100644 --- a/src/protocols/vnc/vnc.c +++ b/src/protocols/vnc/vnc.c @@ -37,8 +37,8 @@ #endif #ifdef ENABLE_COMMON_SSH -#include "guac_sftp.h" -#include "guac_ssh.h" +#include "common-ssh/sftp.h" +#include "common-ssh/ssh.h" #include "sftp.h" #endif diff --git a/src/protocols/vnc/vnc.h b/src/protocols/vnc/vnc.h index 7ae8b720..0edbcd47 100644 --- a/src/protocols/vnc/vnc.h +++ b/src/protocols/vnc/vnc.h @@ -37,9 +37,9 @@ #endif #ifdef ENABLE_COMMON_SSH -#include "guac_sftp.h" -#include "guac_ssh.h" -#include "guac_ssh_user.h" +#include "common-ssh/sftp.h" +#include "common-ssh/ssh.h" +#include "common-ssh/user.h" #endif #include diff --git a/src/terminal/Makefile.am b/src/terminal/Makefile.am index 59bcd123..53bc74d1 100644 --- a/src/terminal/Makefile.am +++ b/src/terminal/Makefile.am @@ -22,16 +22,16 @@ ACLOCAL_AMFLAGS = -I m4 noinst_LTLIBRARIES = libguac_terminal.la -noinst_HEADERS = \ - buffer.h \ - char_mappings.h \ - common.h \ - display.h \ - scrollbar.h \ - terminal.h \ - terminal_handlers.h \ - types.h \ - typescript.h +noinst_HEADERS = \ + terminal/buffer.h \ + terminal/char_mappings.h \ + terminal/common.h \ + terminal/display.h \ + terminal/scrollbar.h \ + terminal/terminal.h \ + terminal/terminal_handlers.h \ + terminal/types.h \ + terminal/typescript.h libguac_terminal_la_SOURCES = \ buffer.c \ diff --git a/src/terminal/buffer.c b/src/terminal/buffer.c index e536d92a..29855924 100644 --- a/src/terminal/buffer.c +++ b/src/terminal/buffer.c @@ -19,8 +19,8 @@ #include "config.h" -#include "buffer.h" -#include "common.h" +#include "terminal/buffer.h" +#include "terminal/common.h" #include #include diff --git a/src/terminal/common.c b/src/terminal/common.c index 4018e771..99137534 100644 --- a/src/terminal/common.c +++ b/src/terminal/common.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "types.h" +#include "terminal/types.h" #include #include diff --git a/src/terminal/display.c b/src/terminal/display.c index e671c608..1a0aeb52 100644 --- a/src/terminal/display.c +++ b/src/terminal/display.c @@ -19,10 +19,10 @@ #include "config.h" -#include "common.h" #include "common/surface.h" -#include "display.h" -#include "types.h" +#include "terminal/common.h" +#include "terminal/display.h" +#include "terminal/types.h" #include #include diff --git a/src/terminal/scrollbar.c b/src/terminal/scrollbar.c index f8cd99db..ddff2997 100644 --- a/src/terminal/scrollbar.c +++ b/src/terminal/scrollbar.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "scrollbar.h" +#include "terminal/scrollbar.h" #include #include diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c index d77cb677..758b72d7 100644 --- a/src/terminal/terminal.c +++ b/src/terminal/terminal.c @@ -19,15 +19,15 @@ #include "config.h" -#include "buffer.h" -#include "common.h" #include "common/clipboard.h" #include "common/cursor.h" -#include "display.h" -#include "terminal.h" -#include "terminal_handlers.h" -#include "types.h" -#include "typescript.h" +#include "terminal/buffer.h" +#include "terminal/common.h" +#include "terminal/display.h" +#include "terminal/terminal.h" +#include "terminal/terminal_handlers.h" +#include "terminal/types.h" +#include "terminal/typescript.h" #include #include diff --git a/src/terminal/buffer.h b/src/terminal/terminal/buffer.h similarity index 100% rename from src/terminal/buffer.h rename to src/terminal/terminal/buffer.h diff --git a/src/terminal/char_mappings.h b/src/terminal/terminal/char_mappings.h similarity index 100% rename from src/terminal/char_mappings.h rename to src/terminal/terminal/char_mappings.h diff --git a/src/terminal/common.h b/src/terminal/terminal/common.h similarity index 100% rename from src/terminal/common.h rename to src/terminal/terminal/common.h diff --git a/src/terminal/display.h b/src/terminal/terminal/display.h similarity index 100% rename from src/terminal/display.h rename to src/terminal/terminal/display.h diff --git a/src/terminal/scrollbar.h b/src/terminal/terminal/scrollbar.h similarity index 100% rename from src/terminal/scrollbar.h rename to src/terminal/terminal/scrollbar.h diff --git a/src/terminal/terminal.h b/src/terminal/terminal/terminal.h similarity index 100% rename from src/terminal/terminal.h rename to src/terminal/terminal/terminal.h diff --git a/src/terminal/terminal_handlers.h b/src/terminal/terminal/terminal_handlers.h similarity index 100% rename from src/terminal/terminal_handlers.h rename to src/terminal/terminal/terminal_handlers.h diff --git a/src/terminal/types.h b/src/terminal/terminal/types.h similarity index 100% rename from src/terminal/types.h rename to src/terminal/terminal/types.h diff --git a/src/terminal/typescript.h b/src/terminal/terminal/typescript.h similarity index 100% rename from src/terminal/typescript.h rename to src/terminal/terminal/typescript.h diff --git a/src/terminal/terminal_handlers.c b/src/terminal/terminal_handlers.c index 2bae0f2b..328400cc 100644 --- a/src/terminal/terminal_handlers.c +++ b/src/terminal/terminal_handlers.c @@ -19,10 +19,10 @@ #include "config.h" -#include "char_mappings.h" -#include "terminal.h" -#include "terminal_handlers.h" -#include "types.h" +#include "terminal/char_mappings.h" +#include "terminal/terminal.h" +#include "terminal/terminal_handlers.h" +#include "terminal/types.h" #include #include diff --git a/src/terminal/typescript.c b/src/terminal/typescript.c index aa922f0a..69c8a1db 100644 --- a/src/terminal/typescript.c +++ b/src/terminal/typescript.c @@ -19,7 +19,7 @@ #include "config.h" #include "common/io.h" -#include "typescript.h" +#include "terminal/typescript.h" #include