summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libxrdp/libxrdp.c5
-rw-r--r--libxrdp/xrdp_caps.c3
-rw-r--r--libxrdp/xrdp_sec.c2
-rw-r--r--rdp/rdp_lic.c15
-rw-r--r--rdp/rdp_orders.c10
-rw-r--r--sesman/sesman.c1
-rw-r--r--sesman/tools/sesrun.c2
-rw-r--r--sesman/tools/sestest.c4
-rw-r--r--xrdp/xrdp.c2
9 files changed, 22 insertions, 22 deletions
diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c
index a823bfdf..0015f26b 100644
--- a/libxrdp/libxrdp.c
+++ b/libxrdp/libxrdp.c
@@ -253,8 +253,8 @@ libxrdp_process_data(struct xrdp_session *session, struct stream *s)
{
/*This situation can happen and this is a workaround*/
cont = 0;
- g_writeln("Serious programming error we were locked in a deadly loop") ;
- g_writeln("remaining :%d", s->end - s->next_packet);
+ g_writeln("Serious programming error: we were locked in a deadly loop");
+ g_writeln("Remaining: %d", (int) (s->end - s->next_packet));
s->next_packet = 0;
}
@@ -1298,7 +1298,6 @@ libxrdp_fastpath_send_surface(struct xrdp_session *session,
struct stream ls;
struct stream *s;
struct xrdp_rdp *rdp;
- int rv;
int sec_bytes;
int rdp_bytes;
int max_bytes;
diff --git a/libxrdp/xrdp_caps.c b/libxrdp/xrdp_caps.c
index 6d109f76..300704c6 100644
--- a/libxrdp/xrdp_caps.c
+++ b/libxrdp/xrdp_caps.c
@@ -562,7 +562,8 @@ xrdp_caps_process_confirm_active(struct xrdp_rdp *self, struct stream *s)
in_uint16_le(s, len);
if ((len < 4) || !s_check_rem(s, len - 4))
{
- g_writeln("xrdp_caps_process_confirm_active: error len %d", len, s->end - s->p);
+ g_writeln("xrdp_caps_process_confirm_active: error: len %d, "
+ "remaining %d", len, (int) (s->end - s->p));
return 1;
}
len -= 4;
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index 06dfdda7..4076699e 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -419,7 +419,7 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info)
}
else
{
- LLOGLN(0, ("xrdp_load_keyboard_layout: error opening %d",
+ LLOGLN(0, ("xrdp_load_keyboard_layout: error opening %s",
keyboard_cfg_file));
}
}
diff --git a/rdp/rdp_lic.c b/rdp/rdp_lic.c
index 2441bc7f..799c14b7 100644
--- a/rdp/rdp_lic.c
+++ b/rdp/rdp_lic.c
@@ -73,6 +73,7 @@ rdp_lic_generate_hwid(struct rdp_lic *self, char *hwid)
LICENCE_HWID_SIZE - 4);
}
+#if 0
/*****************************************************************************/
/* Present an existing licence to the server */
static void APP_CC
@@ -112,6 +113,7 @@ rdp_lic_present(struct rdp_lic *self, char *client_random, char *rsa_data,
rdp_sec_send(self->sec_layer, s, sec_flags);
free_stream(s);
}
+#endif
/*****************************************************************************/
/* Send a licence request packet */
@@ -161,13 +163,7 @@ rdp_lic_process_demand(struct rdp_lic *self, struct stream *s)
{
char null_data[SEC_MODULUS_SIZE];
char *server_random;
- char signature[LICENCE_SIGNATURE_SIZE];
- char hwid[LICENCE_HWID_SIZE];
- char *licence_data;
- int licence_size;
- void *crypt_key;
- licence_data = 0;
/* Retrieve the server random from the incoming packet */
in_uint8p(s, server_random, SEC_RANDOM_SIZE);
/* We currently use null client keys. This is a bit naughty but, hey,
@@ -176,10 +172,17 @@ rdp_lic_process_demand(struct rdp_lic *self, struct stream *s)
rdp_lic_generate_keys(self, null_data, server_random, null_data);
#if 0
+ int licence_size;
+ char *licence_data;
+
licence_size = 0; /* todo load_licence(&licence_data); */
if (licence_size > 0)
{
+ void *crypt_key;
+ char hwid[LICENCE_HWID_SIZE];
+ char signature[LICENCE_SIGNATURE_SIZE];
+
/* Generate a signature for the HWID buffer */
rdp_lic_generate_hwid(self, hwid);
rdp_sec_sign(signature, 16, self->licence_sign_key, 16,
diff --git a/rdp/rdp_orders.c b/rdp/rdp_orders.c
index 3372a815..518a42ee 100644
--- a/rdp/rdp_orders.c
+++ b/rdp/rdp_orders.c
@@ -326,15 +326,13 @@ rdp_orders_process_bmpcache(struct rdp_orders *self, struct stream *s,
int bpp = 0;
int Bpp = 0;
int bufsize = 0;
- int pad1 = 0;
- int pad2 = 0;
int row_size = 0;
int final_size = 0;
struct rdp_bitmap *bitmap = (struct rdp_bitmap *)NULL;
struct stream *rec_s = (struct stream *)NULL;
in_uint8(s, cache_id);
- in_uint8(s, pad1);
+ in_uint8s(s, 1); /* pad */
in_uint8(s, width);
in_uint8(s, height);
in_uint8(s, bpp);
@@ -348,7 +346,7 @@ rdp_orders_process_bmpcache(struct rdp_orders *self, struct stream *s,
}
else
{
- in_uint16_le(s, pad2);
+ in_uint8s(s, 2); /* pad */
in_uint16_le(s, size);
in_uint16_le(s, row_size);
in_uint16_le(s, final_size);
@@ -1115,8 +1113,8 @@ static void APP_CC
rdp_orders_process_desksave(struct rdp_orders *self, struct stream *s,
int present, int delta)
{
- int width = 0;
- int height = 0;
+ //int width = 0;
+ //int height = 0;
if (present & 0x01)
{
diff --git a/sesman/sesman.c b/sesman/sesman.c
index e530464b..fe1f0952 100644
--- a/sesman/sesman.c
+++ b/sesman/sesman.c
@@ -46,7 +46,6 @@ sesman_main_loop(void)
int error;
int robjs_count;
int cont;
- int pid;
tbus sck_obj;
tbus robjs[8];
diff --git a/sesman/tools/sesrun.c b/sesman/tools/sesrun.c
index a9181583..19932620 100644
--- a/sesman/tools/sesrun.c
+++ b/sesman/tools/sesrun.c
@@ -115,7 +115,7 @@ main(int argc, char **argv)
{
in_uint16_be(in_s, data);
in_uint16_be(in_s, display);
- g_printf("ok %d display %d\n", data, display);
+ g_printf("ok %d display %d\n", (int)data, display);
}
}
}
diff --git a/sesman/tools/sestest.c b/sesman/tools/sestest.c
index cf28f803..e1c09cf2 100644
--- a/sesman/tools/sestest.c
+++ b/sesman/tools/sestest.c
@@ -201,8 +201,8 @@ int inputSession(struct SCP_SESSION *s)
}
g_printf("session type:\n");
- g_printf("0: Xvnc\n", SCP_SESSION_TYPE_XVNC);
- g_printf("1: x11rdp\n", SCP_SESSION_TYPE_XRDP);
+ g_printf("%d: Xvnc\n", SCP_SESSION_TYPE_XVNC);
+ g_printf("%d: x11rdp\n", SCP_SESSION_TYPE_XRDP);
integer = menuSelect(1);
if (integer == 1)
diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c
index b92bedd3..dca7f44d 100644
--- a/xrdp/xrdp.c
+++ b/xrdp/xrdp.c
@@ -107,7 +107,7 @@ xrdp_shutdown(int sig)
threadid = tc_get_threadid();
g_writeln("shutting down");
- g_writeln("signal %d threadid %p", sig, threadid);
+ g_writeln("signal %d threadid %lld", sig, (long long)threadid);
if (!g_is_wait_obj_set(g_term_event))
{
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-14 23:49:22 +0000