You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2020/09/21 03:35:45 UTC

[guacamole-server] branch master updated (382d72a -> 3e1e1bd)

This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git.


    from 382d72a  GUACAMOLE-1158: Merge handle received clipboard data only if copy has not been disabled.
     add 21a5d9e  GUACAMOLE-221: Add protocol functions for sending prompt to client.
     add 7369bed  GUACAMOLE-221: Add support for sending multiple params in required.
     add 76ef633  GUACAMOLE-221: Make lock, condition, and flags specific to credentials.
     add 939d954  GUACAMOLE-221: Extract array writing in protocol into common function and document.
     add 4318083  GUACAMOLE-221: Fix up style, comments, and variable names.
     add 51b9c9c  GUACAMOLE-221: Remove manual addition of null terminator
     add 7759f9b  GUACAMOLE-221: Add socket keepalive when sending required fields.
     add 5c309f5  GUACAMOLE-221: Move away from reserved function names.
     add 5881209  GUACAMOLE-221: Move keep-alives to protocol implementation and only send required instruction to owner.
     add 5ec2551  GUACAMOLE-221: Use constants for parameters updated via argv or required instructions.
     add c579e73  GUACAMOLE-221: Implement function for sending required to client owner.
     add 0761908  GUACAMOLE-221: Sockets start keep alive by default.
     add b00b629  GUACAMOLE-221: Clean up VNC mutex; update comments.
     add bc8ed4e  GUACAMOLE-221: Implement guacd support for verifying that client can accept the required instruction.
     add 0db6119  GUACAMOLE-221: Fix up lots of comments, streamline code, and fix SSH mutex lock.
     add e8feeab  GUACAMOLE-221: Implement CUnit tests for protocol version comparison and conversion.
     add 98dbf15  GUACAMOLE-221: Fix up SSH terminal prompt fallback.
     add 26b9850  GUACAMOLE-221: Remove bad rebase code.
     add ec3cdfd  GUACAMOLE-221: We need to flush the socket after sending required.
     add f70fdfc  GUACAMOLE-221: Add back in SSH credential argv support; fix style and comments.
     add b6d3edb  GUACAMOLE-221: Move VNC and RDP argv to new callback.
     add 6605f21  GUACAMOLE-221: Rollback changes to SSH protocol prompting
     add bfb54f7  GUACAMOLE-221: Clean up libguac, protocol changes, and documentation.
     add 3b4007c  GUACAMOLE-221: Tweak logic for when RDP domain is requested.
     add 9e1dada  GUACAMOLE-221: Add CUnit tests for guac_strdup()
     add 3e19583  GUACAMOLE-221: Switch VNC credentials to NULL when parameter is not passed
     add aa870de  GUACAMOLE-221: Merge server-side support for parameter prompting.
     new 3e1e1bd  Merge 1.3.0 changes back to master.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/guacd/proc.c                                   |   3 +
 src/libguac/client.c                               |  68 ++++++++++
 src/libguac/guacamole/client.h                     |  31 +++++
 src/libguac/guacamole/protocol-constants.h         |   2 +-
 src/libguac/guacamole/protocol-types.h             |  34 +++++
 src/libguac/guacamole/protocol.h                   |  43 +++++++
 src/libguac/guacamole/string.h                     |  13 ++
 src/libguac/guacamole/user.h                       |  17 +++
 src/libguac/protocol.c                             | 139 +++++++++++++++++----
 src/libguac/string.c                               |  11 ++
 src/libguac/tests/Makefile.am                      |   2 +
 src/libguac/tests/protocol/guac_protocol_version.c |  69 ++++++++++
 .../extend.c => libguac/tests/string/strdup.c}     |  37 +++---
 src/libguac/user-handshake.c                       |   8 +-
 src/libguac/user.c                                 |   9 ++
 src/protocols/rdp/Makefile.am                      |   2 +
 src/protocols/{ssh/pipe.c => rdp/argv.c}           |  42 ++++---
 src/protocols/{ssh/input.h => rdp/argv.h}          |  27 ++--
 src/protocols/rdp/rdp.c                            |  76 +++++++++--
 src/protocols/rdp/settings.c                       |  57 +++------
 src/protocols/rdp/user.c                           |   5 +
 src/protocols/vnc/Makefile.am                      |   2 +
 src/protocols/{ssh/pipe.c => vnc/argv.c}           |  35 +++---
 src/protocols/{ssh/input.h => vnc/argv.h}          |  22 ++--
 src/protocols/vnc/auth.c                           |  75 ++++++++++-
 src/protocols/vnc/client.c                         |   4 +-
 src/protocols/vnc/settings.c                       |  11 +-
 src/protocols/vnc/user.c                           |   5 +
 src/protocols/vnc/vnc.c                            |   3 -
 29 files changed, 703 insertions(+), 149 deletions(-)
 create mode 100644 src/libguac/tests/protocol/guac_protocol_version.c
 copy src/{common/tests/rect/extend.c => libguac/tests/string/strdup.c} (56%)
 copy src/protocols/{ssh/pipe.c => rdp/argv.c} (54%)
 copy src/protocols/{ssh/input.h => rdp/argv.h} (54%)
 copy src/protocols/{ssh/pipe.c => vnc/argv.c} (60%)
 copy src/protocols/{ssh/input.h => vnc/argv.h} (62%)


[guacamole-server] 01/01: Merge 1.3.0 changes back to master.

Posted by mj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit 3e1e1bd268916c32f5b0fb216a635a8cac39064c
Merge: 382d72a aa870de
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Sun Sep 20 20:35:26 2020 -0700

    Merge 1.3.0 changes back to master.

 src/guacd/proc.c                                   |   3 +
 src/libguac/client.c                               |  68 ++++++++++
 src/libguac/guacamole/client.h                     |  31 +++++
 src/libguac/guacamole/protocol-constants.h         |   2 +-
 src/libguac/guacamole/protocol-types.h             |  34 +++++
 src/libguac/guacamole/protocol.h                   |  43 +++++++
 src/libguac/guacamole/string.h                     |  13 ++
 src/libguac/guacamole/user.h                       |  17 +++
 src/libguac/protocol.c                             | 139 +++++++++++++++++----
 src/libguac/string.c                               |  11 ++
 src/libguac/tests/Makefile.am                      |   2 +
 src/libguac/tests/protocol/guac_protocol_version.c |  69 ++++++++++
 src/libguac/tests/string/strdup.c                  |  49 ++++++++
 src/libguac/user-handshake.c                       |   8 +-
 src/libguac/user.c                                 |   9 ++
 src/protocols/rdp/Makefile.am                      |   2 +
 src/protocols/rdp/argv.c                           |  60 +++++++++
 src/protocols/rdp/argv.h                           |  54 ++++++++
 src/protocols/rdp/rdp.c                            |  76 +++++++++--
 src/protocols/rdp/settings.c                       |  57 +++------
 src/protocols/rdp/user.c                           |   5 +
 src/protocols/vnc/Makefile.am                      |   2 +
 src/protocols/vnc/argv.c                           |  53 ++++++++
 src/protocols/vnc/argv.h                           |  47 +++++++
 src/protocols/vnc/auth.c                           |  75 ++++++++++-
 src/protocols/vnc/client.c                         |   4 +-
 src/protocols/vnc/settings.c                       |  11 +-
 src/protocols/vnc/user.c                           |   5 +
 src/protocols/vnc/vnc.c                            |   3 -
 29 files changed, 867 insertions(+), 85 deletions(-)