Date: Thu, 30 Sep 2010 10:09:52 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r213295 - in projects/sv: sys/dev/e1000 sys/netinet usr.sbin/netdumpsrv Message-ID: <201009301009.o8UA9qV0059774@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Thu Sep 30 10:09:52 2010 New Revision: 213295 URL: http://svn.freebsd.org/changeset/base/213295 Log: Fix style issues: - Add cdefs in netdumpsrv.c - Fix a couple of missing whitespace in ORing operations in netdumpsrv.c - Add prefixes to structures Modified: projects/sv/sys/dev/e1000/if_em.c projects/sv/sys/dev/e1000/if_lem.c projects/sv/sys/netinet/netdump.h projects/sv/sys/netinet/netdump_client.c projects/sv/usr.sbin/netdumpsrv/netdumpsrv.c Modified: projects/sv/sys/dev/e1000/if_em.c ============================================================================== --- projects/sv/sys/dev/e1000/if_em.c Thu Sep 30 07:12:09 2010 (r213294) +++ projects/sv/sys/dev/e1000/if_em.c Thu Sep 30 10:09:52 2010 (r213295) @@ -328,10 +328,10 @@ static ndumplock_handler_t em_ndump_enab #ifdef NETDUMP_CLIENT static struct netdump_methods em_ndump_methods = { - .poll_locked = em_poll, - .poll_unlocked = em_poll_unlocked, - .disable_intr = em_ndump_disable_intr, - .enable_intr = em_ndump_enable_intr + .ne_poll_locked = em_poll, + .ne_poll_unlocked = em_poll_unlocked, + .ne_disable_intr = em_ndump_disable_intr, + .ne_enable_intr = em_ndump_enable_intr }; #endif Modified: projects/sv/sys/dev/e1000/if_lem.c ============================================================================== --- projects/sv/sys/dev/e1000/if_lem.c Thu Sep 30 07:12:09 2010 (r213294) +++ projects/sv/sys/dev/e1000/if_lem.c Thu Sep 30 10:09:52 2010 (r213295) @@ -298,10 +298,10 @@ static ndumplock_handler_t lem_ndump_ena #ifdef NETDUMP_CLIENT static struct netdump_methods lem_ndump_methods = { - .poll_locked = lem_poll, - .poll_unlocked = lem_poll_unlocked, - .disable_intr = lem_ndump_disable_intr, - .enable_intr = lem_ndump_enable_intr + .ne_poll_locked = lem_poll, + .ne_poll_unlocked = lem_poll_unlocked, + .ne_disable_intr = lem_ndump_disable_intr, + .ne_enable_intr = lem_ndump_enable_intr }; #endif Modified: projects/sv/sys/netinet/netdump.h ============================================================================== --- projects/sv/sys/netinet/netdump.h Thu Sep 30 07:12:09 2010 (r213294) +++ projects/sv/sys/netinet/netdump.h Thu Sep 30 10:09:52 2010 (r213295) @@ -43,20 +43,20 @@ #define NETDUMP_DATASIZE 8192 /* Packets payload. */ struct netdump_msg_hdr { - uint32_t type; /* NETDUMP_HERALD, _FINISHED, _VMCORE, _KDH. */ - uint32_t seqno; /* Match acks with msgs. */ - uint64_t offset; /* vmcore offset (bytes). */ - uint32_t len; /* Attached data (bytes). */ - uint32_t _pad; /* Pad space matching 32- and 64-bits archs. */ + uint32_t mh_type; /* NETDUMP_HERALD, _FINISHED, _VMCORE, _KDH. */ + uint32_t mh_seqno; /* Match acks with msgs. */ + uint64_t mh_offset; /* vmcore offset (bytes). */ + uint32_t mh_len; /* Attached data (bytes). */ + uint32_t mh__pad; /* Pad space matching 32- and 64-bits archs. */ }; struct netdump_ack { - uint32_t seqno; /* Match acks with msgs. */ + uint32_t na_seqno; /* Match acks with msgs. */ }; struct netdump_msg { - struct netdump_msg_hdr hdr; - uint8_t data[NETDUMP_DATASIZE]; + struct netdump_msg_hdr nm_hdr; + uint8_t nm_data[NETDUMP_DATASIZE]; }; #ifdef _KERNEL @@ -64,10 +64,10 @@ struct netdump_msg { typedef void ndumplock_handler_t(struct ifnet *); struct netdump_methods { - poll_handler_t *poll_locked; - poll_handler_t *poll_unlocked; - ndumplock_handler_t *disable_intr; - ndumplock_handler_t *enable_intr; + poll_handler_t *ne_poll_locked; + poll_handler_t *ne_poll_unlocked; + ndumplock_handler_t *ne_disable_intr; + ndumplock_handler_t *ne_enable_intr; }; #endif Modified: projects/sv/sys/netinet/netdump_client.c ============================================================================== --- projects/sv/sys/netinet/netdump_client.c Thu Sep 30 07:12:09 2010 (r213294) +++ projects/sv/sys/netinet/netdump_client.c Thu Sep 30 10:09:52 2010 (r213295) @@ -603,11 +603,11 @@ retransmit: /* leave room for udpip */ MH_ALIGN(m, sizeof(struct netdump_msg_hdr)); nd_msg_hdr = mtod(m, struct netdump_msg_hdr *); - nd_msg_hdr->seqno = htonl(nd_seqno+i); - nd_msg_hdr->type = htonl(type); - nd_msg_hdr->offset = htobe64(offset + sent_so_far); - nd_msg_hdr->len = htonl(pktlen); - nd_msg_hdr->_pad = 0; + nd_msg_hdr->mh_seqno = htonl(nd_seqno+i); + nd_msg_hdr->mh_type = htonl(type); + nd_msg_hdr->mh_offset = htobe64(offset + sent_so_far); + nd_msg_hdr->mh_len = htonl(pktlen); + nd_msg_hdr->mh__pad = 0; if (pktlen) { if ((m2 = m_get(M_DONTWAIT, MT_DATA)) == NULL) { @@ -827,7 +827,7 @@ nd_handle_ip(struct mbuf **mb) */ nd_ack = (struct netdump_ack *) (mtod(m, caddr_t) + sizeof(struct udpiphdr)); - rcv_ackno = ntohl(nd_ack->seqno); + rcv_ackno = ntohl(nd_ack->na_seqno); if (nd_server_port == NETDUMP_PORT) { nd_server_port = ntohs(udp->ui_u.uh_sport); @@ -1060,11 +1060,11 @@ netdump_network_poll() #if defined(KDB) && !defined(KDB_UNATTENDED) if (panicstr != NULL) - nd_nic->if_ndumpfuncs->poll_unlocked(nd_nic, + nd_nic->if_ndumpfuncs->ne_poll_unlocked(nd_nic, POLL_AND_CHECK_STATUS, 1000); else #endif - nd_nic->if_ndumpfuncs->poll_locked(nd_nic, + nd_nic->if_ndumpfuncs->ne_poll_locked(nd_nic, POLL_AND_CHECK_STATUS, 1000); } @@ -1178,7 +1178,7 @@ netdump_trigger(void *arg, int howto) #if defined(KDB) && !defined(KDB_UNATTENDED) if (panicstr == NULL) #endif - nd_nic->if_ndumpfuncs->disable_intr(nd_nic); + nd_nic->if_ndumpfuncs->ne_disable_intr(nd_nic); } /* Make the card use *our* receive callback */ @@ -1233,7 +1233,7 @@ trig_abort: #if defined(KDB) && !defined(KDB_UNATTENDED) if (panicstr == NULL) #endif - nd_nic->if_ndumpfuncs->enable_intr(nd_nic); + nd_nic->if_ndumpfuncs->ne_enable_intr(nd_nic); } dumping--; } Modified: projects/sv/usr.sbin/netdumpsrv/netdumpsrv.c ============================================================================== --- projects/sv/usr.sbin/netdumpsrv/netdumpsrv.c Thu Sep 30 07:12:09 2010 (r213294) +++ projects/sv/usr.sbin/netdumpsrv/netdumpsrv.c Thu Sep 30 10:09:52 2010 (r213295) @@ -23,6 +23,7 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #include <sys/param.h> @@ -250,7 +251,7 @@ alloc_client(struct sockaddr_in *sip) "%s/vmcore.%s.%d", dumpdir, client->hostname, i); /* Try the info file first. */ - fd = open(client->infofilename, O_WRONLY|O_CREAT|O_EXCL, + fd = open(client->infofilename, O_WRONLY | O_CREAT | O_EXCL, DEFFILEMODE); if (fd == -1) { if (errno != EEXIST) @@ -267,7 +268,7 @@ alloc_client(struct sockaddr_in *sip) } /* Next make the core file. */ - fd = open(client->corefilename, O_RDWR|O_CREAT|O_EXCL, + fd = open(client->corefilename, O_RDWR | O_CREAT | O_EXCL, DEFFILEMODE); if (fd == -1) { @@ -383,7 +384,7 @@ send_ack(struct netdump_client *client, assert(client != NULL && msg != NULL); bzero(&ack, sizeof(ack)); - ack.seqno = htonl(msg->hdr.seqno); + ack.na_seqno = htonl(msg->nm_hdr.mh_seqno); do { tryagain = 0; if (send(client->sock, &ack, sizeof(ack), 0) == -1) { @@ -448,8 +449,8 @@ handle_kdh(struct netdump_client *client return; client->any_data_rcvd = 1; - h = (struct kerneldumpheader *)msg->data; - if (msg->hdr.len < sizeof(struct kerneldumpheader)) { + h = (struct kerneldumpheader *)msg->nm_data; + if (msg->nm_hdr.len < sizeof(struct kerneldumpheader)) { LOGERR("Bad KDH from %s [%s]: packet too small\n", client->hostname, client_ntoa(client)); client_pinfo(client, "Bad KDH: packet too small\n"); @@ -495,18 +496,18 @@ handle_vmcore(struct netdump_client *cli return; client->any_data_rcvd = 1; - if (msg->hdr.seqno % 11523 == 0) { + if (msg->nm_hdr.mh_seqno % 11523 == 0) { /* Approximately every 16MB with MTU of 1500 */ LOGINFO("."); } - if (pwrite(client->corefd, msg->data, msg->hdr.len, - msg->hdr.offset) == -1) { + if (pwrite(client->corefd, msg->nm_data, msg->nm_hdr.len, + msg->nm_hdr.mh_offset) == -1) { LOGERR("pwrite (for client %s [%s]): %s\n", client->hostname, client_ntoa(client), strerror(errno)); client_pinfo(client, "Dump unsuccessful: write error @ offset %08"PRIx64": %s\n", - msg->hdr.offset, strerror(errno)); + msg->nm_hdr.mh_offset, strerror(errno)); exec_handler(client, "error"); free_client(client); return; @@ -568,15 +569,15 @@ receive_message(int isock, struct sockad } /* 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); + msg->nm_hdr.mh_type = ntohl(msg->nm_hdr.mh_type); + msg->nm_hdr.mh_seqno = ntohl(msg->nm_hdr.mh_seqno); + msg->nm_hdr.mh_offset = be64toh(msg->nm_hdr.mh_offset); + msg->nm_hdr.mh_len = ntohl(msg->nm_hdr.mh_len); - if ((size_t)len < sizeof(struct netdump_msg_hdr) + msg->hdr.len) { + if ((size_t)len < sizeof(struct netdump_msg_hdr) + msg->nm_hdr.mh_len) { LOGERR("Packet too small from %s (got %zu, expected %zu)\n", fromstr, (size_t)len, - sizeof(struct netdump_msg_hdr) + msg->hdr.len); + sizeof(struct netdump_msg_hdr) + msg->nm_hdr.mh_len); return (0); } return (len); @@ -592,7 +593,7 @@ handle_packet(struct netdump_client *cli if (client != NULL) client->last_msg = time(NULL); - switch (msg->hdr.type) { + switch (msg->nm_hdr.mh_type) { case NETDUMP_HERALD: handle_herald(from, client, msg); break; @@ -607,7 +608,7 @@ handle_packet(struct netdump_client *cli break; default: LOGERR("Received unknown message type %d from %s\n", - msg->hdr.type, fromstr); + msg->nm_hdr.mh_type, fromstr); } } @@ -687,7 +688,7 @@ eventloop(void) * packets. */ if (client != NULL && - msg.hdr.type != NETDUMP_HERALD && + msg.nm_hdr.mh_type != NETDUMP_HERALD && client->printed_port_warning == 0) { LOGWARN("Client %s responding on server port\n", client->hostname);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009301009.o8UA9qV0059774>