diff options
author | Jay Sorg <jay.sorg@gmail.com> | 2014-05-20 01:36:53 +0300 |
---|---|---|
committer | speidy <speidy@gmail.com> | 2014-05-20 01:36:53 +0300 |
commit | 89cbe76f574602c1340b7f86a06a3fafcb486c48 (patch) | |
tree | 329941748c76356b2a666eb0d20aaef14f23bfe7 | |
parent | 05a281a3f88ec2800f6fda660c0ccdf8257468c1 (diff) | |
download | xrdp-proprietary-89cbe76f574602c1340b7f86a06a3fafcb486c48.tar.gz xrdp-proprietary-89cbe76f574602c1340b7f86a06a3fafcb486c48.zip |
neutrinordp: minor changes, coding style, log level
Conflicts:
neutrinordp/xrdp-neutrinordp.c
neutrinordp/xrdp-neutrinordp.h
-rw-r--r-- | neutrinordp/xrdp-neutrinordp.c | 9 | ||||
-rw-r--r-- | neutrinordp/xrdp-neutrinordp.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/neutrinordp/xrdp-neutrinordp.c b/neutrinordp/xrdp-neutrinordp.c index 8e8f3cac..ec33bbb5 100644 --- a/neutrinordp/xrdp-neutrinordp.c +++ b/neutrinordp/xrdp-neutrinordp.c @@ -27,7 +27,7 @@ #ifdef XRDP_DEBUG #define LOG_LEVEL 99 #else -#define LOG_LEVEL 11 +#define LOG_LEVEL 1 #endif #define LLOG(_level, _args) \ @@ -280,8 +280,7 @@ lxrdp_event(struct mod *mod, int msg, long param1, long param2, data = (char *)param3; total_size = (int)param4; - LLOGLN(10, ("lxrdp_event: client to server ,chanid= %d flags= %d", chanid, flags)); - g_hexdump(data, size); // for debugging + LLOGLN(12, ("lxrdp_event: client to server ,chanid= %d flags= %d", chanid, flags)); if ((chanid < 0) || (chanid >= mod->inst->settings->num_channels)) { LLOGLN(0, ("lxrdp_event: error chanid %d", chanid)); @@ -1473,7 +1472,6 @@ lfreerdp_pre_connect(freerdp *instance) instance->update->pointer->PointerNew = lfreerdp_pointer_new; instance->update->pointer->PointerCached = lfreerdp_pointer_cached; - if ((mod->username[0] != 0) && (mod->password[0] != 0)) { /* since we have username and password, we can try nla */ @@ -1761,7 +1759,6 @@ lfreerdp_post_connect(freerdp *instance) mod = ((struct mod_context *)(instance->context))->modi; g_memset(mod->password, 0, sizeof(mod->password)); - mod->inst->update->window->WindowCreate = lrail_WindowCreate; mod->inst->update->window->WindowUpdate = lrail_WindowUpdate; mod->inst->update->window->WindowDelete = lrail_WindowDelete; @@ -1773,7 +1770,6 @@ lfreerdp_post_connect(freerdp *instance) mod->inst->update->window->MonitoredDesktop = lrail_MonitoredDesktop; mod->inst->update->window->NonMonitoredDesktop = lrail_NonMonitoredDesktop; - return 1; } @@ -1816,7 +1812,6 @@ lfreerdp_receive_channel_data(freerdp *instance, int channelId, uint8 *data, if (lchid >= 0) { LLOGLN(10, ("lfreerdp_receive_channel_data: server to client, chanid: %d", lchid)); - g_hexdump(data, size); // for debugging error = mod->server_send_to_channel(mod, lchid, (char *)data, size, total_size, flags); diff --git a/neutrinordp/xrdp-neutrinordp.h b/neutrinordp/xrdp-neutrinordp.h index 9cd3a8c3..aaff6d5a 100644 --- a/neutrinordp/xrdp-neutrinordp.h +++ b/neutrinordp/xrdp-neutrinordp.h @@ -172,6 +172,8 @@ struct mod int vrev; char username[256]; char password[256]; + int bool_keyBoardSynced ; /* Numlock can be out of sync, we hold state here to resolve */ + int keyBoardLockInfo ; /* Holds initial numlock capslock state */ struct xrdp_client_info client_info; |