--- mqtt/src/client.c 2012/04/24 08:06:08 1.2.2.2 +++ mqtt/src/client.c 2012/07/03 09:02:50 1.3 @@ -4,24 +4,6 @@ int -InitClient(void) -{ - int sock; - - sock = socket(args->addr.sa.sa_family, SOCK_STREAM, IPPROTO_TCP); - if (sock == -1) { - printf("Error:: socket() #%d - %s\n", errno, strerror(errno)); - return -1; - } - if (connect(sock, &args->addr.sa, args->addr.sa.sa_len) == -1) { - printf("Error:: connect() #%d - %s\n", errno, strerror(errno)); - return -1; - } - - return sock; -} - -int ConnectClient(int sock) { int siz = 0; @@ -56,6 +38,7 @@ ConnectClient(int sock) if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) return -1; + memset(args->msg->msg_base, 0, args->msg->msg_len); siz = recv(sock, args->msg->msg_base, args->msg->msg_len, 0); if (siz == -1) { printf("Error:: recv() #%d - %s\n", errno, strerror(errno)); @@ -66,66 +49,6 @@ ConnectClient(int sock) return (u_char) mqtt_readCONNACK(args->msg); } -int -CloseClient(int sock) -{ - int siz = 0; - - siz = mqtt_msgDISCONNECT(args->msg); - if (siz == -1) { - printf("Error:: msgDISCONNECT #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); - return -1; - } - - siz = send(sock, args->msg->msg_base, siz, MSG_NOSIGNAL); - if (siz == -1) { - printf("Error:: send() #%d - %s\n", errno, strerror(errno)); - return -1; - } else - ioVERBOSE(3) printf("Sended DISCONNECT %d bytes\n", siz); - - shutdown(sock, SHUT_RDWR); - close(sock); - return siz; -} - -int -KAClient(int sock) -{ - int siz = 0; - struct pollfd pfd; - - siz = mqtt_msgPINGREQ(args->msg); - if (siz == -1) { - printf("Error:: msgPINGREQ #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); - return -1; - } - if (SendTo(sock, siz) == -1) - return -1; - - pfd.fd = sock; - pfd.events = POLLIN | POLLPRI; - switch (poll(&pfd, 1, args->ka * 1000)) { - case -1: - printf("Error:: poll() #%d - %s\n", errno, strerror(errno)); - return -1; - case 0: - ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000); - return -1; - } - if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) - return -1; - - siz = recv(sock, args->msg->msg_base, args->msg->msg_len, 0); - if (siz == -1) { - printf("Error:: recv() #%d - %s\n", errno, strerror(errno)); - return -1; - } else - ioVERBOSE(3) printf("Received %d bytes\n", siz); - - return mqtt_readPINGRESP(args->msg); -} - void * OpenFile(void) { @@ -180,6 +103,8 @@ RecvFrom(int sock) struct pollfd pfd; int siz = 0; + memset(args->msg->msg_base, 0, args->msg->msg_len); + pfd.fd = sock; pfd.events = POLLIN | POLLPRI; do { @@ -189,7 +114,7 @@ RecvFrom(int sock) return -1; case 0: ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000); - if (KAClient(sock) == -1) + if (mqtt_KeepAlive(sock, args->ka, 1) == -1) return -1; continue; }