From owner-p4-projects@FreeBSD.ORG Sat Jul 4 18:36:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C56D1065678; Sat, 4 Jul 2009 18:36:07 +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 57FAF1065676 for ; Sat, 4 Jul 2009 18:36:07 +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 45DA58FC14 for ; Sat, 4 Jul 2009 18:36:07 +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 n64Ia7uG014713 for ; Sat, 4 Jul 2009 18:36:07 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n64Ia7im014711 for perforce@freebsd.org; Sat, 4 Jul 2009 18:36:07 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 4 Jul 2009 18:36:07 GMT Message-Id: <200907041836.n64Ia7im014711@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 165604 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: Sat, 04 Jul 2009 18:36:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=165604 Change 165604 by pgj@petymeg-current on 2009/07/04 18:35:38 - Fix KVM extraction - Rename kread() to kread_data() to avoid confusions with kread() in netstat when debugging Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#38 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#22 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#24 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#38 (text+ko) ==== @@ -286,7 +286,7 @@ } #define KREAD(off, buf, len) do { \ - if (kread(kvm, (uintptr_t)(off), (buf), (len)) != 0) { \ + if (kread_data(kvm, (uintptr_t)(off), (buf), (len)) != 0) { \ return (-1); \ } \ } while (0); @@ -557,13 +557,22 @@ { kvm_t *kvm; int result, i; - struct nlist nls[MAX(nlUNP_MAX, nlINP_MAX) + 1]; + struct nlist nls[nlUNP_MAX + 1 + nlINP_MAX + 1]; - nls[0].n_name = NULL; + bzero(nls, sizeof(nls)); if (flags & NETSTAT_SOCKET_KVM) { /* Use KVM to retrieve data. */ kvm = (kvm_t *)kvm_handle; switch (domain) { + case PF_UNSPEC: + for (i = 0; i < nlUNP_MAX; i++) + nls[i].n_name = strdup(unp_symbol[i]); + nls[nlUNP_MAX].n_name = NULL; + for (i = nlUNP_MAX + 1; + i < (nlUNP_MAX + 1 + nlINP_MAX + 1); i++) + nls[i].n_name = strdup(inp_symbol[i]); + nls[nlUNP_MAX + 1 + nlINP_MAX].n_name = NULL; + break; case PF_LOCAL: for (i = 0; i < nlUNP_MAX; i++) nls[i].n_name = strdup(unp_symbol[i]); @@ -590,12 +599,12 @@ result = netstat_local_sockets(0, list, kvm, nls, flags); if (result < 0) goto end; - result = netstat_inet_sockets(PF_INET, 0, list, kvm, nls, - flags); + result = netstat_inet_sockets(PF_INET, 0, list, kvm, + &nls[nlUNP_MAX + 1], flags); if (result < 0) goto end; - result = netstat_inet_sockets(PF_INET6, 0, list, kvm, nls, - flags); + result = netstat_inet_sockets(PF_INET6, 0, list, kvm, + &nls[nlUNP_MAX + 1], flags); if (result < 0) goto end; break; @@ -605,8 +614,8 @@ break; case PF_INET: case PF_INET6: - result = (netstat_inet_sockets(domain, protocol, list, kvm, nls, - flags)); + result = (netstat_inet_sockets(domain, protocol, list, kvm, + nls, flags)); goto end; break; default: @@ -616,7 +625,8 @@ } end: - for (i = 0; nls[i].n_name != NULL && i < MAX(nlUNP_MAX, nlINP_MAX); i++) + for (i = 0; nls[i].n_name != NULL && i < nlUNP_MAX + nlINP_MAX + 2; + i++) free(nls[i].n_name); return (result); } ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#22 (text+ko) ==== @@ -132,7 +132,7 @@ struct socket_type *sti_next; }; -int kread(kvm_t *kvm, u_long kvm_pointer, void *address, size_t size); +int kread_data(kvm_t *kvm, u_long kvm_pointer, void *address, size_t size); int kread_string(kvm_t *kvm, u_long kvm_pointer, char *buffer, int buflen); void _netstat_stl_empty(struct socket_type_list *list); ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#24 (text+ko) ==== @@ -39,7 +39,7 @@ #include "netstat_internal.h" int -kread(kvm_t *kvm, u_long kvm_pointer, void *address, size_t size) +kread_data(kvm_t *kvm, u_long kvm_pointer, void *address, size_t size) { ssize_t ret; @@ -103,10 +103,11 @@ xso->so_linger = so->so_linger; xso->so_state = so->so_state; xso->so_pcb = so->so_pcb; - if (kread(kvm, (uintptr_t)so->so_proto, &proto, sizeof(proto)) != 0) + if (kread_data(kvm, (uintptr_t)so->so_proto, &proto, sizeof(proto)) + != 0) return (-1); xso->xso_protocol = proto.pr_protocol; - if (kread(kvm, (uintptr_t)proto.pr_domain, &domain, + if (kread_data(kvm, (uintptr_t)proto.pr_domain, &domain, sizeof(domain)) != 0) return (-1); xso->xso_family = domain.dom_family;