From e95b01f7e9df67b36146226326bd6724eede16b8 Mon Sep 17 00:00:00 2001 From: hyc Date: Mon, 22 Mar 2010 00:40:34 +0000 Subject: [PATCH] Full debug for server handshake git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@381 400ebc74-4327-4243-bc38-086b20814532 --- librtmp/handshake.h | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/librtmp/handshake.h b/librtmp/handshake.h index cd6ac74..316c143 100644 --- a/librtmp/handshake.h +++ b/librtmp/handshake.h @@ -728,6 +728,7 @@ SHandShake(RTMP * r) return false; RTMP_Log(RTMP_LOGDEBUG, "%s: Type Requested : %02X", __FUNCTION__, type); + RTMP_LogHexString(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); if (type == 3) { @@ -822,10 +823,8 @@ SHandShake(RTMP * r) SHA256_DIGEST_LENGTH); } -#ifdef _DEBUG - RTMP_Log(RTMP_LOGDEBUG, "Serversig: "); - RTMP_LogHex(RTMP_LOGDEBUG, serversig, RTMP_SIG_SIZE); -#endif + RTMP_Log(RTMP_LOGDEBUG2, "Serversig: "); + RTMP_LogHexString(RTMP_LOGDEBUG2, serversig, RTMP_SIG_SIZE); if (!WriteN(r, serversig-1, RTMP_SIG_SIZE + 1)) return false; @@ -838,11 +837,6 @@ SHandShake(RTMP * r) RTMP_Log(RTMP_LOGDEBUG, "%s: Player Version: %d.%d.%d.%d", __FUNCTION__, clientsig[4], clientsig[5], clientsig[6], clientsig[7]); -#ifdef _DEBUG - RTMP_Log(RTMP_LOGDEBUG, "Client signature:"); - RTMP_LogHex(RTMP_LOGDEBUG, clientsig, RTMP_SIG_SIZE); -#endif - if (FP9HandShake) { /* we have to use this signature now to find the correct algorithms for getting the digest and DH positions */ @@ -952,11 +946,10 @@ SHandShake(RTMP * r) memcpy(clientsig+4, &uptime, 4); } -#ifdef _DEBUG - RTMP_Log(RTMP_LOGDEBUG, "%s: Sending handshake response: ", + RTMP_Log(RTMP_LOGDEBUG2, "%s: Sending handshake response: ", __FUNCTION__); - RTMP_LogHex(RTMP_LOGDEBUG, clientsig, RTMP_SIG_SIZE); -#endif + RTMP_LogHexString(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); + if (!WriteN(r, clientsig, RTMP_SIG_SIZE)) return false; @@ -964,10 +957,8 @@ SHandShake(RTMP * r) if (ReadN(r, clientsig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) return false; -#ifdef _DEBUG - RTMP_Log(RTMP_LOGDEBUG, "%s: 2nd handshake: ", __FUNCTION__); - RTMP_LogHex(RTMP_LOGDEBUG, clientsig, RTMP_SIG_SIZE); -#endif + RTMP_Log(RTMP_LOGDEBUG2, "%s: 2nd handshake: ", __FUNCTION__); + RTMP_LogHexString(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); if (FP9HandShake) { -- 2.50.1