From owner-svn-src-projects@FreeBSD.ORG Mon Aug 9 22:19:23 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 E800B1065677; Mon, 9 Aug 2010 22:19:22 +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 CC1278FC15; Mon, 9 Aug 2010 22:19:22 +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 o79MJM4u023101; Mon, 9 Aug 2010 22:19:22 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o79MJMTq023098; Mon, 9 Aug 2010 22:19:22 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201008092219.o79MJMTq023098@svn.freebsd.org> From: Attilio Rao Date: Mon, 9 Aug 2010 22:19:22 +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: r211121 - in projects/sv/sys: net netinet 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: Mon, 09 Aug 2010 22:19:23 -0000 Author: attilio Date: Mon Aug 9 22:19:22 2010 New Revision: 211121 URL: http://svn.freebsd.org/changeset/base/211121 Log: Export some informations because they will be used by the userland server application. Also do some BSDification (using the right s/u_/u for bits types and moving the payload of the msg to be using uint8_t). Modified: projects/sv/sys/net/netdump_client.c projects/sv/sys/netinet/netdump.h Modified: projects/sv/sys/net/netdump_client.c ============================================================================== --- projects/sv/sys/net/netdump_client.c Mon Aug 9 22:06:08 2010 (r211120) +++ projects/sv/sys/net/netdump_client.c Mon Aug 9 22:19:22 2010 (r211121) @@ -99,35 +99,8 @@ #define NETDDEBUGV_IF(i, f, ...) #endif -#define NETDUMP_PORT 20023 /* server udp port number for data */ -#define NETDUMP_ACKPORT 20024 /* client udp port number for acks */ - -#define NETDUMP_DATASIZE 8192 /* how big to let the packets be */ - -#define NETDUMP_HERALD 1 /* broadcast before starting a dump */ -#define NETDUMP_FINISHED 2 /* send after finishing a dump */ -#define NETDUMP_VMCORE 3 /* packet contains dump data */ -#define NETDUMP_KDH 4 /* packet contains kernel dump header */ - #define NETDUMP_BROKEN_STATE_BUFFER_SIZE (5 * sizeof(struct mtx)) -struct netdump_msg_hdr { - u_int32_t type; /* NETDUMP_HERALD, _FINISHED, _VMCORE or _KDH */ - u_int32_t seqno; /* match acks with msgs */ - u_int64_t offset; /* vmcore offset, in bytes */ - u_int32_t len; /* attached data, in bytes */ - u_int8_t pad[4]; /* Pad for parifying 32 and 64 bits */ -}; - -struct netdump_msg { - struct netdump_msg_hdr hdr; - unsigned char data[NETDUMP_DATASIZE];/* real message may contain less */ -}; - -struct netdump_ack { - u_int32_t seqno; /* match acks with msgs */ -}; - static void nd_handle_arp(struct mbuf **mb); static void nd_handle_ip(struct mbuf **mb); static int netdump_arp_server(void); Modified: projects/sv/sys/netinet/netdump.h ============================================================================== --- projects/sv/sys/netinet/netdump.h Mon Aug 9 22:06:08 2010 (r211120) +++ projects/sv/sys/netinet/netdump.h Mon Aug 9 22:19:22 2010 (r211121) @@ -31,6 +31,33 @@ #ifndef _NETINET_NETDUMP_H_ #define _NETINET_NETDUMP_H_ +#define NETDUMP_PORT 20023 /* Server udp port number for data. */ +#define NETDUMP_ACKPORT 20024 /* Client udp port number for acks. */ + +#define NETDUMP_HERALD 1 /* Broadcast before starting a dump. */ +#define NETDUMP_FINISHED 2 /* Send after finishing a dump. */ +#define NETDUMP_VMCORE 3 /* Contains dump datas. */ +#define NETDUMP_KDH 4 /* Contains kernel dump header. */ + +#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). */ + uint8_t pad[4]; /* Pad for parifying 32 and 64 bits. */ +}; + +struct netdump_ack { + uint32_t seqno; /* Match acks with msgs. */ +}; + +struct netdump_msg { + struct netdump_msg_hdr hdr; + uint8_t data[NETDUMP_DATASIZE]; +}; + #ifdef _KERNEL struct mtx;