From 1731b9aeda2180a6cf828f7a114406670a080d82 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Mon, 8 Nov 2010 19:09:28 +0100
Subject: [PATCH 1/2] Meer debugging
---
Connector_RTMP/main.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Connector_RTMP/main.cpp b/Connector_RTMP/main.cpp
index 87b67b22..5e0c1ad6 100644
--- a/Connector_RTMP/main.cpp
+++ b/Connector_RTMP/main.cpp
@@ -160,6 +160,8 @@ int main(int argc, char ** argv){
}
}
//#ifdef DEBUG
+ if (socketError){fprintf(stderr, "socketError\n");}
+ if (All_Hell_Broke_Loose){fprintf(stderr, "All Hell Broke Loose\n");}
fprintf(stderr, "User %i disconnected.\n", CONN_fd);
//#endif
return 0;
From a575eb2359d660882a1e8fbff1b6a9f79300cba5 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Mon, 8 Nov 2010 19:13:35 +0100
Subject: [PATCH 2/2] Meer debugging
---
util/flv_sock.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/util/flv_sock.cpp b/util/flv_sock.cpp
index ac520b43..8dd8fbc9 100644
--- a/util/flv_sock.cpp
+++ b/util/flv_sock.cpp
@@ -35,7 +35,11 @@ bool ReadUntil(char * buffer, unsigned int count, unsigned int & sofar, int sock
if (sofar >= count){return true;}
int r = 0;
r = DDV_iread(buffer + sofar,count-sofar,sock);
- if (r < 0){All_Hell_Broke_Loose = true; return false;}
+ if (r < 0){
+ All_Hell_Broke_Loose = true;
+ fprintf(stderr, "ReadUntil fail: %s. All Hell Broke Loose!\n", strerror(errno));
+ return false;
+ }
sofar += r;
if (sofar >= count){return true;}
return false;
@@ -63,7 +67,10 @@ bool FLV_GetPacket(FLV_Pack *& p, int sock){
if (FLV_Checkheader(p->data)){
sofar = 0;
memcpy(FLVHeader, p->data, 13);
- }else{All_Hell_Broke_Loose = true;}
+ }else{
+ All_Hell_Broke_Loose = true;
+ fprintf(stderr, "Invalid FLV header. All Hell Broke Loose!\n");
+ }
}
}else{
//if a tag header, calculate length and read tag body