You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/07/06 02:59:47 UTC

[13/13] incubator-guacamole-server git commit: GUACAMOLE-337: Merge move of libguacd code into public libguac API.

GUACAMOLE-337: Merge move of libguacd code into public libguac API.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/6236eb8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/6236eb8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/6236eb8f

Branch: refs/heads/master
Commit: 6236eb8f98ff96c495ae94cb4fe3279c202db465
Parents: 3fdd1e9 b608d22
Author: James Muehlner <ja...@guac-dev.org>
Authored: Wed Jul 5 19:56:06 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Wed Jul 5 19:56:06 2017 -0700

----------------------------------------------------------------------
 Makefile.am                        |   2 -
 configure.ac                       |   5 -
 src/guacd/Makefile.am              |   2 -
 src/guacd/connection.c             |   3 +-
 src/guacd/daemon.c                 |   1 -
 src/guacd/proc-map.c               |   1 -
 src/guacd/proc-map.h               |   7 +-
 src/guacd/proc.c                   |   3 +-
 src/guacd/proc.h                   |  13 +
 src/libguac/Makefile.am            |   9 +-
 src/libguac/guacamole/socket-ssl.h |  77 ++++++
 src/libguac/guacamole/user.h       |  24 ++
 src/libguac/socket-ssl.c           | 160 ++++++++++++
 src/libguac/user-handshake.c       | 437 ++++++++++++++++++++++++++++++++
 src/libguacd/Makefile.am           |  50 ----
 src/libguacd/libguacd/log.h        |  42 ---
 src/libguacd/libguacd/socket-ssl.h |  71 ------
 src/libguacd/libguacd/user.h       | 113 ---------
 src/libguacd/log.c                 |  72 ------
 src/libguacd/socket-ssl.c          | 160 ------------
 src/libguacd/user.c                | 321 -----------------------
 21 files changed, 727 insertions(+), 846 deletions(-)
----------------------------------------------------------------------