projects
/
libguac-client-rdp.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use guac_error appropriately.
[libguac-client-rdp.git]
/
src
/
client.c
diff --git
a/src/client.c
b/src/client.c
index
41b1bbc
..
e45c5cc
100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-57,6
+57,7
@@
#include <guacamole/socket.h>
#include <guacamole/protocol.h>
#include <guacamole/client.h>
#include <guacamole/socket.h>
#include <guacamole/protocol.h>
#include <guacamole/client.h>
+#include <guacamole/error.h>
#include "client.h"
#include "guac_handlers.h"
#include "client.h"
#include "guac_handlers.h"
@@
-248,8
+249,14
@@
int guac_client_init(guac_client* client, int argc, char** argv) {
boolean bitmap_cache;
if (argc < 8) {
boolean bitmap_cache;
if (argc < 8) {
- guac_protocol_send_error(client->socket, "Wrong argument count received.");
+
+ guac_protocol_send_error(client->socket,
+ "Wrong argument count received.");
guac_socket_flush(client->socket);
guac_socket_flush(client->socket);
+
+ guac_error = GUAC_STATUS_BAD_ARGUMENT;
+ guac_error_message = "Wrong argument count received";
+
return 1;
}
return 1;
}
@@
-371,8
+378,14
@@
int guac_client_init(guac_client* client, int argc, char** argv) {
/* Connect to RDP server */
if (!freerdp_connect(rdp_inst)) {
/* Connect to RDP server */
if (!freerdp_connect(rdp_inst)) {
- guac_protocol_send_error(client->socket, "Error connecting to RDP server");
+
+ guac_protocol_send_error(client->socket,
+ "Error connecting to RDP server");
guac_socket_flush(client->socket);
guac_socket_flush(client->socket);
+
+ guac_error = GUAC_STATUS_BAD_STATE;
+ guac_error_message = "Error connecting to RDP server";
+
return 1;
}
return 1;
}