From 3d82c5f9cdd0554761948e4d5b43a8917f1a43fc Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Sun, 21 Jul 2013 22:56:15 +0200 Subject: [PATCH] Add logging to the IrDA communication. --- src/irda.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/irda.c b/src/irda.c index 4556256..078c79e 100644 --- a/src/irda.c +++ b/src/irda.c @@ -174,6 +174,8 @@ irda_socket_set_timeout (irda_t *device, long timeout) if (device == NULL) return -1; // EINVAL (Invalid argument) + INFO (device->context, "Timeout: value=%li", timeout); + device->timeout = timeout; return 0; @@ -251,6 +253,14 @@ irda_socket_discover (irda_t *device, irda_callback_t callback, void *userdata) unsigned int address = array_uint32_be (list->Device[i].irdaDeviceID); unsigned int hints = (list->Device[i].irdaDeviceHints1 << 8) + list->Device[i].irdaDeviceHints2; + + INFO (device->context, + "Discover: address=%08x, name=%s, charset=%02x, hints=%04x", + address, + list->Device[i].irdaDeviceName, + list->Device[i].irdaCharSet, + hints); + callback (address, list->Device[i].irdaDeviceName, list->Device[i].irdaCharSet, @@ -260,6 +270,14 @@ irda_socket_discover (irda_t *device, irda_callback_t callback, void *userdata) #else for (unsigned int i = 0; i < list->len; ++i) { unsigned int hints = array_uint16_be (list->dev[i].hints); + + INFO (device->context, + "Discover: address=%08x, name=%s, charset=%02x, hints=%04x", + list->dev[i].daddr, + list->dev[i].info, + list->dev[i].charset, + hints); + callback (list->dev[i].daddr, list->dev[i].info, list->dev[i].charset, @@ -279,6 +297,8 @@ irda_socket_connect_name (irda_t *device, unsigned int address, const char *name if (device == NULL) return -1; + INFO (device->context, "Connect: address=%08x, name=%s", address, name ? name : ""); + #ifdef _WIN32 SOCKADDR_IRDA peer; peer.irdaAddressFamily = AF_IRDA; @@ -314,6 +334,8 @@ irda_socket_connect_lsap (irda_t *device, unsigned int address, unsigned int lsa if (device == NULL) return -1; + INFO (device->context, "Connect: address=%08x, lsap=%u", address, lsap); + #ifdef _WIN32 SOCKADDR_IRDA peer; peer.irdaAddressFamily = AF_IRDA; @@ -397,6 +419,8 @@ irda_socket_read (irda_t *device, void *data, unsigned int size) nbytes += n; } + HEXDUMP (device->context, DC_LOGLEVEL_INFO, "Read", (unsigned char *) data, nbytes); + return nbytes; } @@ -418,5 +442,7 @@ irda_socket_write (irda_t *device, const void *data, unsigned int size) nbytes += n; } + HEXDUMP (device->context, DC_LOGLEVEL_INFO, "Write", (unsigned char *) data, nbytes); + return nbytes; }