From owner-svn-src-projects@FreeBSD.ORG Sun Aug 22 20:30:18 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C43A2106566B; Sun, 22 Aug 2010 20:30:18 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B3DD68FC1B; Sun, 22 Aug 2010 20:30:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7MKUIjJ014136; Sun, 22 Aug 2010 20:30:18 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7MKUIHS014134; Sun, 22 Aug 2010 20:30:18 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201008222030.o7MKUIHS014134@svn.freebsd.org> From: Attilio Rao Date: Sun, 22 Aug 2010 20:30:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211644 - projects/sv/usr.sbin/netdumpsrv X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Aug 2010 20:30:18 -0000 Author: attilio Date: Sun Aug 22 20:30:18 2010 New Revision: 211644 URL: http://svn.freebsd.org/changeset/base/211644 Log: More functions style cleanups. Modified: projects/sv/usr.sbin/netdumpsrv/netdump_server.c Modified: projects/sv/usr.sbin/netdumpsrv/netdump_server.c ============================================================================== --- projects/sv/usr.sbin/netdumpsrv/netdump_server.c Sun Aug 22 20:25:03 2010 (r211643) +++ projects/sv/usr.sbin/netdumpsrv/netdump_server.c Sun Aug 22 20:30:18 2010 (r211644) @@ -511,83 +511,83 @@ handle_finish(struct netdump_client *cli } -static int receive_message(int sock, struct sockaddr_in *from, char *fromstr, - size_t fromstrlen, struct netdump_msg *msg) +static int +receive_message(int sock, struct sockaddr_in *from, char *fromstr, + size_t fromstrlen, struct netdump_msg *msg) { - socklen_t fromlen; - ssize_t len; + socklen_t fromlen; + ssize_t len; - assert(from != NULL && fromstr != NULL && msg != NULL); + assert(from != NULL && fromstr != NULL && msg != NULL); - bzero(from, sizeof(*from)); - from->sin_family = AF_INET; - from->sin_len = fromlen = sizeof(*from); - from->sin_port = 0; - from->sin_addr.s_addr = INADDR_ANY; + bzero(from, sizeof(*from)); + from->sin_family = AF_INET; + from->sin_len = fromlen = sizeof(*from); + from->sin_port = 0; + from->sin_addr.s_addr = INADDR_ANY; + + len = recvfrom(sock, msg, sizeof(*msg), 0, (struct sockaddr *)from, + &fromlen); + if (len == -1) { - if ((len = recvfrom(sock, msg, sizeof(*msg), 0, - (struct sockaddr *)from, &fromlen)) == -1) - { - /* The caller can use errno to find the error */ - return -1; - } + /* + * As long as some callers may discard the errors printing + * in defined circumstances, leave them the choice and avoid + * any error reporting. + */ + return (-1); + } - snprintf(fromstr, fromstrlen, "%s:%hu", inet_ntoa(from->sin_addr), + snprintf(fromstr, fromstrlen, "%s:%hu", inet_ntoa(from->sin_addr), ntohs(from->sin_port)); + if ((size_t)len < sizeof(struct netdump_msg_hdr)) { + LOGERR("Ignoring runt packet from %s (got %zu)\n", fromstr, + (size_t)len); + return (0); + } - if ((size_t)len < sizeof(struct netdump_msg_hdr)) - { - LOGERR("Ignoring runt packet from %s (got %zu)\n", fromstr, - (size_t)len); - return 0; - } - - /* Convert byte order */ - msg->hdr.type = ntohl(msg->hdr.type); - msg->hdr.seqno = ntohl(msg->hdr.seqno); - msg->hdr.offset = be64toh(msg->hdr.offset); - msg->hdr.len = ntohl(msg->hdr.len); - - if ((size_t)len < sizeof(struct netdump_msg_hdr) + msg->hdr.len) - { - LOGERR("Packet too small from %s (got %zu, expected %zu)\n", - fromstr, (size_t)len, - sizeof(struct netdump_msg_hdr) + msg->hdr.len); - return 0; - } - - return len; + /* Convert byte order. */ + msg->hdr.type = ntohl(msg->hdr.type); + msg->hdr.seqno = ntohl(msg->hdr.seqno); + msg->hdr.offset = be64toh(msg->hdr.offset); + msg->hdr.len = ntohl(msg->hdr.len); + + if ((size_t)len < sizeof(struct netdump_msg_hdr) + msg->hdr.len) { + LOGERR("Packet too small from %s (got %zu, expected %zu)\n", + fromstr, (size_t)len, + sizeof(struct netdump_msg_hdr) + msg->hdr.len); + return (0); + } + return (len); } -static void handle_packet(struct netdump_client *client, - struct sockaddr_in *from, const char *fromstr, struct netdump_msg *msg) +static void +handle_packet(struct netdump_client *client, struct sockaddr_in *from, + const char *fromstr, struct netdump_msg *msg) { - assert(from != NULL && fromstr != NULL && msg != NULL); + assert(from != NULL && fromstr != NULL && msg != NULL); - if (client) - { - client->last_msg = time(NULL); - } + if (client != NULL) + client->last_msg = time(NULL); - switch (msg->hdr.type) - { + switch (msg->hdr.type) { case NETDUMP_HERALD: - handle_herald(from, client, msg); - break; + handle_herald(from, client, msg); + break; case NETDUMP_KDH: - handle_kdh(client, msg); - break; + handle_kdh(client, msg); + break; case NETDUMP_VMCORE: - handle_vmcore(client, msg); - break; + handle_vmcore(client, msg); + break; case NETDUMP_FINISHED: - handle_finish(client, msg); - break; + handle_finish(client, msg); + break; default: - LOGERR("Received unknown message type %d from %s\n", - msg->hdr.type, fromstr); - } + LOGERR("Received unknown message type %d from %s\n", + msg->hdr.type, fromstr); + } } static void eventloop() @@ -733,9 +733,11 @@ static void eventloop() } } -static void signal_shutdown(int sig) +static void +signal_shutdown(int sig) { - do_shutdown=1; + + do_shutdown = 1; } int main(int argc, char **argv)