From fa43a94e029535992bf118c7fdfb5d3f36ef7d41 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 14 Mar 2016 18:27:52 -0700
Subject: [PATCH] GUAC-1389: Rely on API definition for handler.

---
 src/protocols/ssh/client.h    |  9 +--------
 src/protocols/ssh/clipboard.h | 12 +++++-------
 src/protocols/ssh/input.h     |  6 +++---
 src/protocols/ssh/sftp.h      | 21 +--------------------
 src/protocols/ssh/user.h      |  2 +-
 5 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/src/protocols/ssh/client.h b/src/protocols/ssh/client.h
index a9c1c17a..01290532 100644
--- a/src/protocols/ssh/client.h
+++ b/src/protocols/ssh/client.h
@@ -29,15 +29,8 @@
  * Handler which is invoked when the SSH client needs to be disconnected (if
  * connected) and freed. This can happen if initialization fails, or all users
  * have left the connection.
- *
- * @param client
- *     The client associated with the SSH client to be freed.
- *
- * @return
- *     Zero on success, non-zero if an error occurs preventing the client from
- *     being entirely freed.
  */
-int guac_ssh_client_free_handler(guac_client* client);
+guac_client_free_handler guac_ssh_client_free_handler;
 
 #endif
 
diff --git a/src/protocols/ssh/clipboard.h b/src/protocols/ssh/clipboard.h
index 0d6a4d84..59df4ca6 100644
--- a/src/protocols/ssh/clipboard.h
+++ b/src/protocols/ssh/clipboard.h
@@ -29,21 +29,19 @@
 #include <guacamole/stream.h>
 
 /**
- * Handler for inbound clipboard data.
+ * Handler for inbound clipboard streams.
  */
-int guac_ssh_clipboard_handler(guac_user* user, guac_stream* stream,
-        char* mimetype);
+guac_user_clipboard_handler guac_ssh_clipboard_handler;
 
 /**
- * Handler for stream data related to clipboard.
+ * Handler for data received along clipboard streams.
  */
-int guac_ssh_clipboard_blob_handler(guac_user* user, guac_stream* stream,
-        void* data, int length);
+guac_user_blob_handler guac_ssh_clipboard_blob_handler;
 
 /**
  * Handler for end-of-stream related to clipboard.
  */
-int guac_ssh_clipboard_end_handler(guac_user* user, guac_stream* stream);
+guac_user_end_handler guac_ssh_clipboard_end_handler;
 
 #endif
 
diff --git a/src/protocols/ssh/input.h b/src/protocols/ssh/input.h
index 98607360..8de59c31 100644
--- a/src/protocols/ssh/input.h
+++ b/src/protocols/ssh/input.h
@@ -30,17 +30,17 @@
 /**
  * Handler for Guacamole user mouse events.
  */
-int guac_ssh_user_mouse_handler(guac_user* user, int x, int y, int mask);
+guac_user_mouse_handler guac_ssh_user_mouse_handler;
 
 /**
  * Handler for Guacamole user key events.
  */
-int guac_ssh_user_key_handler(guac_user* user, int keysym, int pressed);
+guac_user_key_handler guac_ssh_user_key_handler;
 
 /**
  * Handler for Guacamole user size events.
  */
-int guac_ssh_user_size_handler(guac_user* user, int width, int height);
+guac_user_size_handler guac_ssh_user_size_handler;
 
 #endif
 
diff --git a/src/protocols/ssh/sftp.h b/src/protocols/ssh/sftp.h
index 2beafdf8..3a2ec44f 100644
--- a/src/protocols/ssh/sftp.h
+++ b/src/protocols/ssh/sftp.h
@@ -34,27 +34,8 @@
  * Handles an incoming stream from a Guacamole "file" instruction, saving the
  * contents of that stream to the file having the given name within the
  * upload directory set by guac_sftp_set_upload_path().
- *
- * @param user
- *     The user receiving the uploaded file.
- *
- * @param stream
- *     The stream through which the uploaded file data will be received.
- *
- * @param mimetype
- *     The mimetype of the data being received.
- *
- * @param filename
- *     The filename of the file to write to. This filename will always be taken
- *     relative to the upload path set by
- *     guac_common_ssh_sftp_set_upload_path().
- *
- * @return
- *     Zero if the incoming stream has been handled successfully, non-zero on
- *     failure.
  */
-int guac_sftp_file_handler(guac_user* user, guac_stream* stream,
-        char* mimetype, char* filename);
+guac_user_file_handler guac_sftp_file_handler;
 
 /**
  * Initiates an SFTP file download to the user via the Guacamole "file"
diff --git a/src/protocols/ssh/user.h b/src/protocols/ssh/user.h
index b459cbcd..8bea5ee1 100644
--- a/src/protocols/ssh/user.h
+++ b/src/protocols/ssh/user.h
@@ -30,7 +30,7 @@
 /**
  * Handler for joining users.
  */
-int guac_ssh_user_join_handler(guac_user* user, int argc, char** argv);
+guac_user_join_handler guac_ssh_user_join_handler;
 
 #endif