--- mqtt/src/client.c 2012/07/03 12:46:00 1.4 +++ mqtt/src/client.c 2017/10/08 22:49:24 1.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: client.c,v 1.4 2012/07/03 12:46:00 misho Exp $ +* $Id: client.c,v 1.5 2017/10/08 22:49:24 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -68,7 +68,7 @@ ConnectClient(int sock) printf("Error:: send() #%d - %s\n", errno, strerror(errno)); return -1; } else - ioVERBOSE(3) printf("Sended CONNECT %d bytes\n", siz); + EVERBS(3) printf("Sended CONNECT %d bytes\n", siz); pfd.fd = sock; pfd.events = POLLIN | POLLPRI; @@ -77,7 +77,7 @@ ConnectClient(int sock) printf("Error:: poll() #%d - %s\n", errno, strerror(errno)); return -1; case 0: - ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000); + EVERBS(3) printf("Timeout reached (%d) ...\n", args->ka * 1000); return -1; } if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) @@ -89,7 +89,7 @@ ConnectClient(int sock) printf("Error:: recv() #%d - %s\n", errno, strerror(errno)); return -1; } else - ioVERBOSE(3) printf("Received %d bytes\n", siz); + EVERBS(3) printf("Received %d bytes\n", siz); return (u_char) mqtt_readCONNACK(args->msg); } @@ -129,7 +129,7 @@ CloseFile(void) } } -inline int +int SendTo(int sock, int siz) { siz = send(sock, args->msg->msg_base, siz, MSG_NOSIGNAL); @@ -137,12 +137,12 @@ SendTo(int sock, int siz) printf("Error:: send() #%d - %s\n", errno, strerror(errno)); return -1; } else - ioVERBOSE(3) printf("Sended %d bytes\n", siz); + EVERBS(3) printf("Sended %d bytes\n", siz); return siz; } -inline int +int RecvFrom(int sock) { struct pollfd pfd; @@ -158,7 +158,7 @@ RecvFrom(int sock) printf("Error:: poll() #%d - %s\n", errno, strerror(errno)); return -1; case 0: - ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000); + EVERBS(3) printf("Timeout reached (%d) ...\n", args->ka * 1000); if (mqtt_KeepAlive(sock, args->ka, 1) == -1) return -1; continue; @@ -172,7 +172,7 @@ RecvFrom(int sock) printf("Error:: recv() #%d - %s\n", errno, strerror(errno)); return -1; } else - ioVERBOSE(3) printf("Received %d bytes\n", siz); + EVERBS(3) printf("Received %d bytes\n", siz); return siz; }