don't log error details in error handlers

PacketProtoDecoder: log errors

blog_channels.txt

@@ -41,3 +41,4 @@ DatagramSocketSource 4
 PRStreamSink 4
 PRStreamSource 4
 BSocketPRFileDesc 4
+PacketProtoDecoder 4

client/DatagramPeerIO.c

@@ -85,31 +85,7 @@ void error_handler (DatagramPeerIO *o, int component, int code)
     ASSERT(o->mode == DATAGRAMPEERIO_MODE_CONNECT || o->mode == DATAGRAMPEERIO_MODE_BIND)
     DebugObject_Access(&o->d_obj);
     
-    switch (component) {
-        case DATAGRAMPEERIO_COMPONENT_SINK:
-            switch (code) {
-                case DATAGRAMSOCKETSINK_ERROR_BSOCKET:
-                    BLog(BLOG_NOTICE, "sink BSocket error %d", BSocket_GetError(&o->sock));
-                    break;
-                case DATAGRAMSOCKETSINK_ERROR_WRONGSIZE:
-                    BLog(BLOG_NOTICE, "sink wrong size error");
-                    break;
-                default:
-                    ASSERT(0);
-            }
-            break;
-        case DATAGRAMPEERIO_COMPONENT_SOURCE:
-            switch (code) {
-                case DATAGRAMSOCKETSOURCE_ERROR_BSOCKET:
-                    BLog(BLOG_NOTICE, "source BSocket error %d", BSocket_GetError(&o->sock));
-                    break;
-                default:
-                    ASSERT(0);
-            }
-            break;
-        default:
-            ASSERT(0);
-    }
+    BLog(BLOG_NOTICE, "error");
 }
 
 void reset_mode (DatagramPeerIO *o)

client/StreamPeerIO.c

@@ -314,21 +314,6 @@ void error_handler (StreamPeerIO *pio, int component, int code)
     ASSERT(pio->sock)
     DebugObject_Access(&pio->d_obj);
     
-    switch (component) {
-        case COMPONENT_SOURCE:
-        case COMPONENT_SINK:
-            BLog(BLOG_NOTICE, "BSocket error %d", BSocket_GetError(&pio->sock->sock));
-            if (pio->ssl) {
-                BLog(BLOG_NOTICE, "NSPR error %d", (int)PR_GetError());
-            }
-            break;
-        case COMPONENT_DECODER:
-            BLog(BLOG_NOTICE, "decoder error %d", code);
-            break;
-        default:
-            ASSERT(0);
-    }
-    
     // cleanup
     reset_and_report_error(pio);
     return;

dhcpclient/BDHCPClient.c

@@ -61,18 +61,7 @@ static void error_handler (BDHCPClient *o, int component, int code)
 {
     DebugObject_Access(&o->d_obj);
     
-    switch (component) {
-        case COMPONENT_SOURCE: {
-            BLog(BLOG_ERROR, "source error");
-        } break;
-        
-        case COMPONENT_SINK: {
-            BLog(BLOG_ERROR, "sink error");
-        } break;
-        
-        default:
-            ASSERT(0);
-    }
+    BLog(BLOG_ERROR, "error");
 }
 
 static void dhcp_handler (BDHCPClient *o, int event)

flow/PacketProtoDecoder.c

@@ -26,9 +26,12 @@
 #include <misc/debug.h>
 #include <misc/byteorder.h>
 #include <misc/minmax.h>
+#include <system/BLog.h>
 
 #include <flow/PacketProtoDecoder.h>
 
+#include <generated/blog_channel_PacketProtoDecoder.h>
+
 static void report_error (PacketProtoDecoder *enc, int error);
 static void process_data (PacketProtoDecoder *enc);
 static void input_handler_done (PacketProtoDecoder *enc, int data_len);
@@ -59,6 +62,7 @@ void process_data (PacketProtoDecoder *enc)
         
         // check data length
         if (data_len > enc->output_mtu) {
+            BLog(BLOG_NOTICE, "error: packet too large");
             was_error = 1;
             break;
         }

generated/blog_channel_BSocketPRFileDesc.h

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

generated/blog_channel_PacketProtoDecoder.h

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

generated/blog_channels_defines.h

@@ -41,4 +41,5 @@
 #define BLOG_CHANNEL_PRStreamSink 40
 #define BLOG_CHANNEL_PRStreamSource 41
 #define BLOG_CHANNEL_BSocketPRFileDesc 42
-#define BLOG_NUM_CHANNELS 43
+#define BLOG_CHANNEL_PacketProtoDecoder 43
+#define BLOG_NUM_CHANNELS 44

generated/blog_channels_list.h

@@ -41,3 +41,4 @@
 {.name = "PRStreamSink", .loglevel = 4},
 {.name = "PRStreamSource", .loglevel = 4},
 {.name = "BSocketPRFileDesc", .loglevel = 4},
+{.name = "PacketProtoDecoder", .loglevel = 4},

server/server.c

@@ -1311,20 +1311,7 @@ void client_error_handler (struct client_data *client, int component, int code)
     ASSERT(INITSTATUS_HASLINK(client->initstatus))
     ASSERT(!client->dying)
     
-    switch (component) {
-        case COMPONENT_SOURCE:
-        case COMPONENT_SINK:
-            client_log(client, BLOG_NOTICE, "BSocket error %d", BSocket_GetError(&client->sock));
-            if (options.ssl) {
-                client_log(client, BLOG_NOTICE, "NSPR error %d", (int)PR_GetError());
-            }
-            break;
-        case COMPONENT_DECODER:
-            client_log(client, BLOG_NOTICE, "decoder error %d", code);
-            break;
-        default:
-            ASSERT(0);
-    }
+    client_log(client, BLOG_NOTICE, "error");
     
     client_remove(client);
     return;

server_connection/ServerConnection.c

@@ -266,23 +266,6 @@ void error_handler (ServerConnection *o, int component, int code)
     ASSERT(o->state >= STATE_WAITINIT)
     DebugObject_Access(&o->d_obj);
     
-    switch (component) {
-        case COMPONENT_SOURCE:
-        case COMPONENT_SINK:
-            BLog(BLOG_ERROR, "BSocket error %d", BSocket_GetError(&o->sock));
-            if (o->have_ssl) {
-                BLog(BLOG_ERROR, "NSPR error %d", (int)PR_GetError());
-            }
-            break;
-        case COMPONENT_DECODER:
-            BLog(BLOG_ERROR, "decoder error %d", code);
-            break;
-        default:
-            ASSERT(0);
-    }
-    
-    BLog(BLOG_ERROR, "lost connection");
-    
     report_error(o);
     return;
 }

socksclient/BSocksClient.c

@@ -122,14 +122,10 @@ void error_handler (BSocksClient* o, int component, int code)
     DebugObject_Access(&o->d_obj);
     
     if (o->state == STATE_UP && component == COMPONENT_SOURCE && code == STREAMSOCKETSOURCE_ERROR_CLOSED) {
-        BLog(BLOG_DEBUG, "connection closed");
-        
         report_error(o, BSOCKSCLIENT_EVENT_ERROR_CLOSED);
         return;
     }
     
-    BLog(BLOG_NOTICE, "socket error (%d)", BSocket_GetError(&o->sock));
-    
     report_error(o, BSOCKSCLIENT_EVENT_ERROR);
     return;
 }