[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-605-ga1e4044

[GetAway <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  a1e4044f02243c233e6302c39420da0015672b87 (commit)
       via  58753d2c58c94538b8249b38825fa1dc3b4b592e (commit)
      from  7354b4358507932405ff6a297fc2f2b74e04119b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a1e4044f02243c233e6302c39420da0015672b87
Author: striper <striper@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date:   Thu Jul 2 16:45:03 2015 +0200

    extend debug output
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/misc/libs/libconnection/basicserver.cpp b/misc/libs/libconnection/basicserver.cpp
index dcfc38b..7d5a0c7 100644
--- a/misc/libs/libconnection/basicserver.cpp
+++ b/misc/libs/libconnection/basicserver.cpp
@@ -135,7 +135,8 @@ bool CBasicServer::parse(bool (parse_command)(CBasicMessage::Header &rmsg, int c
 	if (rmsg.version == version)
 		parse_another_command = parse_command(rmsg, conn_fd);
 	else
-		printf("[%s] Command ignored: cmd version %d received - server cmd version is %d\n", name.c_str(), rmsg.version, version);
+		printf("[%s] Command ignored: cmd %x version %d received - server cmd version is %d\n", name.c_str(), rmsg.cmd, rmsg.version, version);
+
 
 	close(conn_fd);
 

commit 58753d2c58c94538b8249b38825fa1dc3b4b592e
Author: GetAway <get...@t-...>
Date:   Thu Jul 2 16:22:42 2015 +0200

    fix casting
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/misc/libs/libconnection/messagetools.cpp b/misc/libs/libconnection/messagetools.cpp
index cf140aa..66b2d54 100644
--- a/misc/libs/libconnection/messagetools.cpp
+++ b/misc/libs/libconnection/messagetools.cpp
@@ -27,7 +27,7 @@ size_t write_length_field (unsigned char * buffer, unsigned int length)
 {
         if (length < 128)
         {
-                buffer[0] = length;
+                buffer[0] = static_cast<unsigned char>(length);
                 return 1;
         }
         else
@@ -47,7 +47,7 @@ size_t write_length_field (unsigned char * buffer, unsigned int length)
                 while (shiftby != 0)
                 {
 			shiftby -= 8;
-                        buffer[pos++] = length >> shiftby;
+                        buffer[pos++] = static_cast<unsigned char>(length >> shiftby);
                 }
                 return pos;
         }
@@ -66,7 +66,7 @@ unsigned int parse_length_field (const unsigned char * buffer)
 
 	else if (size_indicator == 1)
 	{
-		unsigned char length_field_size = buffer[0] & 0x7F;
+		unsigned char length_field_size = static_cast<unsigned char>(buffer[0] & 0x7F);
 		unsigned int i;
 
 		for (i = 0; i < length_field_size; i++)

-----------------------------------------------------------------------

Summary of changes:
 misc/libs/libconnection/basicserver.cpp  |    3 ++-
 misc/libs/libconnection/messagetools.cpp |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)


-- 
Tuxbox-GIT: apps