log errors where they occur

blog_channels.txt

@@ -34,3 +34,10 @@ BDHCPClient 4
 NCDIfConfig 4
 BUnixSignal 4
 BProcess 4
+StreamSocketSink 4
+StreamSocketSource 4
+DatagramSocketSink 4
+DatagramSocketSource 4
+PRStreamSink 4
+PRStreamSource 4
+BSocketPRFileDesc 4

flow/DatagramSocketSink.c

@@ -21,9 +21,12 @@
  */
 
 #include <misc/debug.h>
+#include <system/BLog.h>
 
 #include <flow/DatagramSocketSink.h>
 
+#include <generated/blog_channel_DatagramSocketSink.h>
+
 static void report_error (DatagramSocketSink *s, int error)
 {
     FlowErrorReporter_ReportError(&s->rep, error);
@@ -48,10 +51,12 @@ static void try_send (DatagramSocketSink *s)
     PacketPassInterface_Done(&s->input);
     
     if (res < 0) {
+        BLog(BLOG_NOTICE, "BSocket_SendToFrom failed (%d)", BSocket_GetError(s->bsock));
         report_error(s, DATAGRAMSOCKETSINK_ERROR_BSOCKET);
         return;
     }
     else if (res != old_len) {
+        BLog(BLOG_NOTICE, "Sent only %d out of %d", res, old_len);
         report_error(s, DATAGRAMSOCKETSINK_ERROR_WRONGSIZE);
         return;
     }

flow/DatagramSocketSource.c

@@ -21,9 +21,12 @@
  */
 
 #include <misc/debug.h>
+#include <system/BLog.h>
 
 #include <flow/DatagramSocketSource.h>
 
+#include <generated/blog_channel_DatagramSocketSource.h>
+
 static void report_error (DatagramSocketSource *s, int error)
 {
     FlowErrorReporter_ReportError(&s->rep, error);
@@ -42,6 +45,8 @@ static void try_recv (DatagramSocketSource *s)
     }
     
     if (res < 0) {
+        BLog(BLOG_NOTICE, "BSocket_RecvFromTo failed (%d)", BSocket_GetError(s->bsock));
+        
         // schedule retry
         BPending_Set(&s->retry_job);
         

flow/StreamSocketSink.c

@@ -21,9 +21,12 @@
  */
 
 #include <misc/debug.h>
+#include <system/BLog.h>
 
 #include <flow/StreamSocketSink.h>
 
+#include <generated/blog_channel_StreamSocketSink.h>
+
 static void report_error (StreamSocketSink *s, int error)
 {
     DEBUGERROR(&s->d_err, FlowErrorReporter_ReportError(&s->rep, error))
@@ -41,6 +44,7 @@ static void try_send (StreamSocketSink *s)
     }
     
     if (res < 0) {
+        BLog(BLOG_NOTICE, "BSocket_Send failed (%d)", BSocket_GetError(s->bsock));
         report_error(s, STREAMSOCKETSINK_ERROR_BSOCKET);
         return;
     }

flow/StreamSocketSource.c

@@ -21,9 +21,12 @@
  */
 
 #include <misc/debug.h>
+#include <system/BLog.h>
 
 #include <flow/StreamSocketSource.h>
 
+#include <generated/blog_channel_StreamSocketSource.h>
+
 static void report_error (StreamSocketSource *s, int error)
 {
     DEBUGERROR(&s->d_err, FlowErrorReporter_ReportError(&s->rep, error))
@@ -41,11 +44,13 @@ static void try_recv (StreamSocketSource *s)
     }
     
     if (res < 0) {
+        BLog(BLOG_NOTICE, "BSocket_Recv failed (%d)", BSocket_GetError(s->bsock));
         report_error(s, STREAMSOCKETSOURCE_ERROR_BSOCKET);
         return;
     }
     
     if (res == 0) {
+        BLog(BLOG_NOTICE, "Connection closed");
         report_error(s, STREAMSOCKETSOURCE_ERROR_CLOSED);
         return;
     }

generated/blog_channel_DatagramSocketSink.h

@@ -0,0 +1,4 @@
+#ifdef BLOG_CURRENT_CHANNEL
+#undef BLOG_CURRENT_CHANNEL
+#endif
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_DatagramSocketSink

generated/blog_channel_DatagramSocketSource.h

@@ -0,0 +1,4 @@
+#ifdef BLOG_CURRENT_CHANNEL
+#undef BLOG_CURRENT_CHANNEL
+#endif
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_DatagramSocketSource

generated/blog_channel_PRStreamSink.h

@@ -0,0 +1,4 @@
+#ifdef BLOG_CURRENT_CHANNEL
+#undef BLOG_CURRENT_CHANNEL
+#endif
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_PRStreamSink

generated/blog_channel_PRStreamSource.h

@@ -0,0 +1,4 @@
+#ifdef BLOG_CURRENT_CHANNEL
+#undef BLOG_CURRENT_CHANNEL
+#endif
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_PRStreamSource

generated/blog_channel_StreamSocketSink.h

@@ -0,0 +1,4 @@
+#ifdef BLOG_CURRENT_CHANNEL
+#undef BLOG_CURRENT_CHANNEL
+#endif
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_StreamSocketSink

generated/blog_channel_StreamSocketSource.h

@@ -0,0 +1,4 @@
+#ifdef BLOG_CURRENT_CHANNEL
+#undef BLOG_CURRENT_CHANNEL
+#endif
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_StreamSocketSource

generated/blog_channels_defines.h

@@ -34,4 +34,11 @@
 #define BLOG_CHANNEL_NCDIfConfig 33
 #define BLOG_CHANNEL_BUnixSignal 34
 #define BLOG_CHANNEL_BProcess 35
-#define BLOG_NUM_CHANNELS 36
+#define BLOG_CHANNEL_StreamSocketSink 36
+#define BLOG_CHANNEL_StreamSocketSource 37
+#define BLOG_CHANNEL_DatagramSocketSink 38
+#define BLOG_CHANNEL_DatagramSocketSource 39
+#define BLOG_CHANNEL_PRStreamSink 40
+#define BLOG_CHANNEL_PRStreamSource 41
+#define BLOG_CHANNEL_BSocketPRFileDesc 42
+#define BLOG_NUM_CHANNELS 43

generated/blog_channels_list.h

@@ -34,3 +34,10 @@
 {.name = "NCDIfConfig", .loglevel = 4},
 {.name = "BUnixSignal", .loglevel = 4},
 {.name = "BProcess", .loglevel = 4},
+{.name = "StreamSocketSink", .loglevel = 4},
+{.name = "StreamSocketSource", .loglevel = 4},
+{.name = "DatagramSocketSink", .loglevel = 4},
+{.name = "DatagramSocketSource", .loglevel = 4},
+{.name = "PRStreamSink", .loglevel = 4},
+{.name = "PRStreamSource", .loglevel = 4},
+{.name = "BSocketPRFileDesc", .loglevel = 4},

nspr_support/BSocketPRFileDesc.c

@@ -29,9 +29,12 @@
 
 #include <misc/debug.h>
 #include <misc/offset.h>
+#include <system/BLog.h>
 
 #include <nspr_support/BSocketPRFileDesc.h>
 
+#include <generated/blog_channel_BSocketPRFileDesc.h>
+
 #ifndef NDEBUG
 int bsocketprfiledesc_initialized = 0;
 #endif
@@ -82,6 +85,7 @@ static PRInt32 method_read (PRFileDesc *fd, void *buf, PRInt32 amount)
                 PR_SetError(PR_WOULD_BLOCK_ERROR, 0);
                 return -1;
             default:
+                BLog(BLOG_NOTICE, "BSocket_Recv failed (%d)", BSocket_GetError(bsock));
                 PR_SetError(PR_UNKNOWN_ERROR, 0);
                 return -1;
         }
@@ -108,6 +112,7 @@ static PRInt32 method_write (PRFileDesc *fd, const void *buf, PRInt32 amount)
                 PR_SetError(PR_WOULD_BLOCK_ERROR, 0);
                 return -1;
             default:
+                BLog(BLOG_NOTICE, "BSocket_Send failed (%d)", BSocket_GetError(bsock));
                 PR_SetError(PR_UNKNOWN_ERROR, 0);
                 return -1;
         }

nspr_support/PRStreamSink.c

@@ -20,12 +20,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <inttypes.h>
+
 #include <prerror.h>
 
 #include <misc/debug.h>
+#include <system/BLog.h>
 
 #include <nspr_support/PRStreamSink.h>
 
+#include <generated/blog_channel_PRStreamSink.h>
+
 static void report_error (PRStreamSink *s, int error)
 {
     DEBUGERROR(&s->d_err, FlowErrorReporter_ReportError(&s->rep, error))
@@ -43,6 +48,7 @@ static void try_send (PRStreamSink *s)
     }
     
     if (res < 0) {
+        BLog(BLOG_NOTICE, "PR_Write failed (%"PRIi32")", PR_GetError());
         report_error(s, PRSTREAMSINK_ERROR_NSPR);
         return;
     }

nspr_support/PRStreamSource.c

@@ -20,12 +20,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <inttypes.h>
+
 #include <prerror.h>
 
 #include <misc/debug.h>
+#include <system/BLog.h>
 
 #include <nspr_support/PRStreamSource.h>
 
+#include <generated/blog_channel_PRStreamSource.h>
+
 static void report_error (PRStreamSource *s, int error)
 {
     DEBUGERROR(&s->d_err, FlowErrorReporter_ReportError(&s->rep, error))
@@ -43,11 +48,13 @@ static void try_recv (PRStreamSource *s)
     }
     
     if (res < 0) {
+        BLog(BLOG_NOTICE, "PR_Read failed (%"PRIi32")", PR_GetError());
         report_error(s, PRSTREAMSOURCE_ERROR_NSPR);
         return;
     }
     
     if (res == 0) {
+        BLog(BLOG_NOTICE, "Connection closed");
         report_error(s, PRSTREAMSOURCE_ERROR_CLOSED);
         return;
     }