use the same global log function typedef everywhere

client/DatagramPeerIO.c

@@ -141,7 +141,7 @@ int DatagramPeerIO_Init (
     int otp_warning_count,
     BThreadWorkDispatcher *twd,
     void *user,
-    DatagramPeerIO_logfunc logfunc,
+    BLog_logfunc logfunc,
     DatagramPeerIO_handler_error handler_error,
     DatagramPeerIO_handler_otp_warning handler_otp_warning,
     DatagramPeerIO_handler_otp_ready handler_otp_ready

client/DatagramPeerIO.h

@@ -33,6 +33,7 @@
 #include <protocol/spproto.h>
 #include <protocol/fragmentproto.h>
 #include <base/DebugObject.h>
+#include <base/BLog.h>
 #include <system/BReactor.h>
 #include <system/BAddr.h>
 #include <system/BDatagram.h>
@@ -47,8 +48,6 @@
 #include <client/SPProtoEncoder.h>
 #include <client/SPProtoDecoder.h>
 
-typedef void (*DatagramPeerIO_logfunc) (void *user);
-
 /**
  * Callback function invoked when an error occurs with the peer connection.
  * The object has entered default state.
@@ -96,7 +95,7 @@ typedef struct {
     int payload_mtu;
     struct spproto_security_params sp_params;
     void *user;
-    DatagramPeerIO_logfunc logfunc;
+    BLog_logfunc logfunc;
     DatagramPeerIO_handler_error handler_error;
     int spproto_payload_mtu;
     int effective_socket_mtu;
@@ -161,7 +160,7 @@ int DatagramPeerIO_Init (
     int otp_warning_count,
     BThreadWorkDispatcher *twd,
     void *user,
-    DatagramPeerIO_logfunc logfunc,
+    BLog_logfunc logfunc,
     DatagramPeerIO_handler_error handler_error,
     DatagramPeerIO_handler_otp_warning handler_otp_warning,
     DatagramPeerIO_handler_otp_ready handler_otp_ready

client/FrameDecider.c

@@ -553,7 +553,7 @@ FrameDeciderPeer * FrameDecider_NextDestination (FrameDecider *o)
     }
 }
 
-int FrameDeciderPeer_Init (FrameDeciderPeer *o, FrameDecider *d, void *user, FrameDeciderPeer_logfunc logfunc)
+int FrameDeciderPeer_Init (FrameDeciderPeer *o, FrameDecider *d, void *user, BLog_logfunc logfunc)
 {
     // init arguments
     o->d = d;

client/FrameDecider.h

@@ -34,13 +34,12 @@
 #include <structure/LinkedList2.h>
 #include <structure/LinkedList3.h>
 #include <base/DebugObject.h>
+#include <base/BLog.h>
 #include <system/BReactor.h>
 
 struct _FrameDeciderPeer;
 struct _FrameDecider_mac_entry;
 
-typedef void (*FrameDeciderPeer_logfunc) (void *user);
-
 /**
  * Object that represents a local device.
  */
@@ -66,7 +65,7 @@ typedef struct {
 typedef struct _FrameDeciderPeer {
     FrameDecider *d;
     void *user;
-    FrameDeciderPeer_logfunc logfunc;
+    BLog_logfunc logfunc;
     struct _FrameDecider_mac_entry *mac_entries;
     struct _FrameDecider_group_entry *group_entries;
     LinkedList2Node list_node; // node in FrameDecider.peers_list
@@ -157,7 +156,7 @@ FrameDeciderPeer * FrameDecider_NextDestination (FrameDecider *o);
  * @param logfunc function which prepends the log prefix using {@link BLog_Append}
  * @return 1 on success, 0 on failure
  */
-int FrameDeciderPeer_Init (FrameDeciderPeer *o, FrameDecider *d, void *user, FrameDeciderPeer_logfunc logfunc) WARN_UNUSED;
+int FrameDeciderPeer_Init (FrameDeciderPeer *o, FrameDecider *d, void *user, BLog_logfunc logfunc) WARN_UNUSED;
 
 /**
  * Frees the object.

client/PeerChat.c

@@ -189,7 +189,7 @@ static void ssl_recv_decoder_handler_error (PeerChat *o)
 
 int PeerChat_Init (PeerChat *o, peerid_t peer_id, int ssl_mode, CERTCertificate *ssl_cert, SECKEYPrivateKey *ssl_key,
                    uint8_t *ssl_peer_cert, int ssl_peer_cert_len, BPendingGroup *pg, void *user,
-                   PeerChat_logfunc logfunc,
+                   BLog_logfunc logfunc,
                    PeerChat_handler_error handler_error,
                    PeerChat_handler_message handler_message)
 {

client/PeerChat.h

@@ -32,6 +32,7 @@
 #include <misc/debugerror.h>
 #include <base/DebugObject.h>
 #include <base/BPending.h>
+#include <base/BLog.h>
 #include <flow/SinglePacketSender.h>
 #include <flow/PacketProtoEncoder.h>
 #include <flow/PacketCopier.h>
@@ -54,7 +55,6 @@
 
 //#define PEERCHAT_SIMULATE_ERROR 40
 
-typedef void (*PeerChat_logfunc) (void *user);
 typedef void (*PeerChat_handler_error) (void *user);
 typedef void (*PeerChat_handler_message) (void *user, uint8_t *data, int data_len);
 
@@ -65,7 +65,7 @@ typedef struct {
     uint8_t *ssl_peer_cert;
     int ssl_peer_cert_len;
     void *user;
-    PeerChat_logfunc logfunc;
+    BLog_logfunc logfunc;
     PeerChat_handler_error handler_error;
     PeerChat_handler_message handler_message;
     
@@ -104,7 +104,7 @@ typedef struct {
 
 int PeerChat_Init (PeerChat *o, peerid_t peer_id, int ssl_mode, CERTCertificate *ssl_cert, SECKEYPrivateKey *ssl_key,
                    uint8_t *ssl_peer_cert, int ssl_peer_cert_len, BPendingGroup *pg, void *user,
-                   PeerChat_logfunc logfunc,
+                   BLog_logfunc logfunc,
                    PeerChat_handler_error handler_error,
                    PeerChat_handler_message handler_message) WARN_UNUSED;
 void PeerChat_Free (PeerChat *o);

client/StreamPeerIO.c

@@ -540,7 +540,7 @@ int StreamPeerIO_Init (
     int payload_mtu,
     int sock_sndbuf,
     PacketPassInterface *user_recv_if,
-    StreamPeerIO_logfunc logfunc,
+    BLog_logfunc logfunc,
     StreamPeerIO_handler_error handler_error,
     void *user
 )

client/StreamPeerIO.h

@@ -34,6 +34,7 @@
 
 #include <misc/debug.h>
 #include <base/DebugObject.h>
+#include <base/BLog.h>
 #include <system/BReactor.h>
 #include <system/BConnection.h>
 #include <structure/LinkedList2.h>
@@ -47,8 +48,6 @@
 #include <flow/SingleStreamSender.h>
 #include <client/PasswordListener.h>
 
-typedef void (*StreamPeerIO_logfunc) (void *user);
-
 /**
  * Callback function invoked when an error occurs with the peer connection.
  * The object has entered default state.
@@ -73,7 +72,7 @@ typedef struct {
     int ssl_peer_cert_len;
     int payload_mtu;
     int sock_sndbuf;
-    StreamPeerIO_logfunc logfunc;
+    BLog_logfunc logfunc;
     StreamPeerIO_handler_error handler_error;
     void *user;
     
@@ -153,7 +152,7 @@ int StreamPeerIO_Init (
     int payload_mtu,
     int sock_sndbuf,
     PacketPassInterface *user_recv_if,
-    StreamPeerIO_logfunc logfunc,
+    BLog_logfunc logfunc,
     StreamPeerIO_handler_error handler_error,
     void *user
 ) WARN_UNUSED;

client/client.c

@@ -1353,7 +1353,7 @@ void peer_add (peerid_t id, int flags, const uint8_t *cert, int cert_len)
     
     // init chat
     if (!PeerChat_Init(&peer->chat, peer->id, chat_ssl_mode, client_cert, client_key, peer->cert, peer->cert_len, BReactor_PendingGroup(&ss), peer,
-        (PeerChat_logfunc)peer_logfunc,
+        (BLog_logfunc)peer_logfunc,
         (PeerChat_handler_error)peer_chat_handler_error,
         (PeerChat_handler_message)peer_chat_handler_message
     )) {
@@ -1380,7 +1380,7 @@ void peer_add (peerid_t id, int flags, const uint8_t *cert, int cert_len)
     }
     
     // init frame decider peer
-    if (!FrameDeciderPeer_Init(&peer->decider_peer, &frame_decider, peer, (FrameDeciderPeer_logfunc)peer_logfunc)) {
+    if (!FrameDeciderPeer_Init(&peer->decider_peer, &frame_decider, peer, (BLog_logfunc)peer_logfunc)) {
         peer_log(peer, BLOG_ERROR, "FrameDeciderPeer_Init failed");
         goto fail5;
     }
@@ -1559,7 +1559,7 @@ int peer_init_link (struct peer_data *peer)
             &peer->pio.udp.pio, &ss, data_mtu, CLIENT_UDP_MTU, sp_params,
             options.fragmentation_latency, PEER_UDP_ASSEMBLER_NUM_FRAMES, recv_if,
             options.otp_num_warn, &twd, peer,
-            (DatagramPeerIO_logfunc)peer_logfunc,
+            (BLog_logfunc)peer_logfunc,
             (DatagramPeerIO_handler_error)peer_udp_pio_handler_error,
             (DatagramPeerIO_handler_otp_warning)peer_udp_pio_handler_seed_warning,
             (DatagramPeerIO_handler_otp_ready)peer_udp_pio_handler_seed_ready
@@ -1587,7 +1587,7 @@ int peer_init_link (struct peer_data *peer)
             data_mtu,
             (options.peer_tcp_socket_sndbuf >= 0 ? options.peer_tcp_socket_sndbuf : PEER_DEFAULT_TCP_SOCKET_SNDBUF),
             recv_if,
-            (StreamPeerIO_logfunc)peer_logfunc,
+            (BLog_logfunc)peer_logfunc,
             (StreamPeerIO_handler_error)peer_tcp_pio_handler_error, peer
         )) {
             peer_log(peer, BLOG_ERROR, "StreamPeerIO_Init failed");

ncd/NCDModule.c

@@ -125,7 +125,7 @@ void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleI
                          NCDModule_handler_getvar handler_getvar,
                          NCDModule_handler_getobj handler_getobj,
                          NCDModule_handler_initprocess handler_initprocess,
-                         NCDModule_handler_log handler_log)
+                         BLog_logfunc logfunc)
 {
     // init arguments
     n->m = m;
@@ -139,7 +139,7 @@ void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleI
     n->handler_getvar = handler_getvar;
     n->handler_getobj = handler_getobj;
     n->handler_initprocess = handler_initprocess;
-    n->handler_log = handler_log;
+    n->logfunc = logfunc;
     
     // init jobs
     BPending_Init(&n->init_job, BReactor_PendingGroup(n->reactor), (BPending_handler)init_job_handler, n);
@@ -365,7 +365,7 @@ void NCDModuleInst_Backend_Log (NCDModuleInst *n, int channel, int level, const
     
     va_list vl;
     va_start(vl, fmt);
-    BLog_LogViaFuncVarArg(n->handler_log, n->user, channel, level, fmt, vl);
+    BLog_LogViaFuncVarArg(n->logfunc, n->user, channel, level, fmt, vl);
     va_end(vl);
 }
 

ncd/NCDModule.h

@@ -45,7 +45,6 @@ typedef void (*NCDModule_handler_event) (void *user, int event);
 typedef int (*NCDModule_handler_getvar) (void *user, const char *varname, NCDValue *out);
 typedef struct NCDModuleInst_s * (*NCDModule_handler_getobj) (void *user, const char *objname);
 typedef int (*NCDModule_handler_initprocess) (void *user, struct NCDModuleProcess_s *p, const char *template_name, NCDValue args);
-typedef void (*NCDModule_handler_log) (void *user);
 
 typedef void (*NCDModuleProcess_handler_dead) (void *user);
 typedef void (*NCDModuleProcess_interp_handler_die) (void *user);
@@ -70,7 +69,7 @@ typedef struct NCDModuleInst_s {
     NCDModule_handler_getvar handler_getvar;
     NCDModule_handler_getobj handler_getobj;
     NCDModule_handler_initprocess handler_initprocess;
-    NCDModule_handler_log handler_log;
+    BLog_logfunc logfunc;
     BPending init_job;
     BPending uninit_job;
     BPending die_job;
@@ -98,7 +97,7 @@ void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleI
                          NCDModule_handler_getvar handler_getvar,
                          NCDModule_handler_getobj handler_getobj,
                          NCDModule_handler_initprocess handler_initprocess,
-                         NCDModule_handler_log handler_log);
+                         BLog_logfunc logfunc);
 void NCDModuleInst_Free (NCDModuleInst *n);
 void NCDModuleInst_Event (NCDModuleInst *n, int event);
 int NCDModuleInst_GetVar (NCDModuleInst *n, const char *name, NCDValue *out) WARN_UNUSED;

ncd/ncd.c

@@ -168,7 +168,7 @@ static void process_statement_instance_handler_event (struct process_statement *
 static int process_statement_instance_handler_getvar (struct process_statement *ps, const char *varname, NCDValue *out);
 static NCDModuleInst * process_statement_instance_handler_getobj (struct process_statement *ps, const char *objname);
 static int process_statement_instance_handler_initprocess (struct process_statement *ps, NCDModuleProcess *mp, const char *template_name, NCDValue args);
-static void process_statement_instance_handler_log (struct process_statement *ps);
+static void process_statement_instance_logfunc (struct process_statement *ps);
 static void process_moduleprocess_handler_die (struct process *p);
 
 int main (int argc, char **argv)
@@ -1059,7 +1059,7 @@ void process_advance_job_handler (struct process *p)
         (NCDModule_handler_getvar)process_statement_instance_handler_getvar,
         (NCDModule_handler_getobj)process_statement_instance_handler_getobj,
         (NCDModule_handler_initprocess)process_statement_instance_handler_initprocess,
-        (NCDModule_handler_log)process_statement_instance_handler_log
+        (BLog_logfunc)process_statement_instance_logfunc
     );
     
     // set statement state CHILD
@@ -1396,7 +1396,7 @@ int process_statement_instance_handler_initprocess (struct process_statement *ps
     return 1;
 }
 
-void process_statement_instance_handler_log (struct process_statement *ps)
+void process_statement_instance_logfunc (struct process_statement *ps)
 {
     ASSERT(ps->state != SSTATE_FORGOTTEN)