From owner-p4-projects@FreeBSD.ORG Fri Jul 3 19:31:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E08FB1065678; Fri, 3 Jul 2009 19:31:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E4C81065672 for ; Fri, 3 Jul 2009 19:31:42 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8232B8FC14 for ; Fri, 3 Jul 2009 19:31:42 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n63JVgAk029526 for ; Fri, 3 Jul 2009 19:31:42 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n63JVgoE029524 for perforce@freebsd.org; Fri, 3 Jul 2009 19:31:42 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 3 Jul 2009 19:31:42 GMT Message-Id: <200907031931.n63JVgoE029524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 165575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2009 19:31:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=165575 Change 165575 by pgj@petymeg-current on 2009/07/03 19:31:37 - Fix padding values of unpcb_data and inpcb_data, so they now work correctly between a 64-bit kernel and a 32-bit userland - Fix consistency of types Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#22 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#20 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#22 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in_pcb.h#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/unpcb.h#5 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#22 (text+ko) ==== @@ -64,9 +64,9 @@ const char *netstat_st_get_extname(const struct socket_type *stp); const struct sockbuf_type *netstat_st_get_snd(const struct socket_type *stp); const struct sockbuf_type *netstat_st_get_rcv(const struct socket_type *stp); -uint16_t netstat_st_get_qlen(const struct socket_type *stp); -uint16_t netstat_st_get_incqlen(const struct socket_type *stp); -uint16_t netstat_st_get_qlimit(const struct socket_type *stp); +u_int16_t netstat_st_get_qlen(const struct socket_type *stp); +u_int16_t netstat_st_get_incqlen(const struct socket_type *stp); +u_int16_t netstat_st_get_qlimit(const struct socket_type *stp); u_int64_t netstat_st_get_pcb(const struct socket_type *stp); u_int64_t netstat_st_get_vnode(const struct socket_type *stp); u_int64_t netstat_st_get_conn(const struct socket_type *stp); @@ -82,7 +82,7 @@ const char *netstat_at_get_numeric(const struct addr_type *atp); int netstat_at_get_address(const struct addr_type *atp, char *addr, int addr_len); -uint16_t netstat_at_get_port(const struct addr_type *atp); +u_int16_t netstat_at_get_port(const struct addr_type *atp); const char *netstat_at_get_portname(struct addr_type *atp); /* Socket buffers: */ u_int32_t netstat_sbt_get_cc(const struct sockbuf_type *sbtp); ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#20 (text+ko) ==== @@ -73,10 +73,10 @@ struct sockbuf_type st_snd; struct sockbuf_type st_rcv; - uint16_t st_qlen; /* number of unaccepted connections */ - uint16_t st_incqlen; /* number of unaccepted incomplete + u_int16_t st_qlen; /* number of unaccepted connections */ + u_int16_t st_incqlen; /* number of unaccepted incomplete connections */ - uint16_t st_qlimit; /* max number queued connections */ + u_int16_t st_qlimit; /* max number queued connections */ u_int64_t st_pcb; /* protocol control block */ u_int64_t st_vnode; /* if associated with file */ u_int64_t st_conn; /* control block of connected socket */ ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#22 (text+ko) ==== ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in_pcb.h#4 (text+ko) ==== @@ -293,7 +293,7 @@ u_int16_t id_fport; u_int8_t id_laddr[16]; u_int8_t id_faddr[16]; - u_int8_t _id_pad[8]; + u_int8_t _id_pad[2]; }; ==== //depot/projects/soc2009/pgj_libstat/src/sys/sys/unpcb.h#5 (text+ko) ==== @@ -184,7 +184,7 @@ u_int64_t ud_conn; u_int64_t ud_refs; u_int64_t ud_reflink; - u_int8_t _ud_pad[51]; + u_int8_t _ud_pad[38]; }; #endif /* _SYS_UNPCB_H_ */