From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 00:08:26 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF5C3106566B; Sun, 7 Feb 2010 00:08:26 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A6AD58FC15; Sun, 7 Feb 2010 00:08:26 +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 o1708Q4F079533; Sun, 7 Feb 2010 00:08:26 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1708Qoi079530; Sun, 7 Feb 2010 00:08:26 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070008.o1708Qoi079530@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 00:08:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203582 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 00:08:26 -0000 Author: kmacy Date: Sun Feb 7 00:08:26 2010 New Revision: 203582 URL: http://svn.freebsd.org/changeset/base/203582 Log: add function for printing tuple Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 00:07:37 2010 (r203581) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 00:08:26 2010 (r203582) @@ -451,6 +451,27 @@ flow_to_route(struct flentry *fle, struc } #ifdef INET +#ifdef FLOWTABLE_DEBUG +static void +ipv4_flow_print_tuple(int flags, int proto, struct sockaddr_in *ssin, + struct sockaddr_in *dsin) +{ + char saddr[4*sizeof "123"], daddr[4*sizeof "123"]; + + if (flags & FL_HASH_ALL) { + inet_ntoa_r(*(struct in_addr *) &dsin->sin_addr, daddr); + inet_ntoa_r(*(struct in_addr *) &ssin->sin_addr, saddr); + printf("proto=%d %s:%d->%s:%d\n", + proto, saddr, ntohs(ssin->sin_port), daddr, + ntohs(dsin->sin_port)); + } else { + inet_ntoa_r(*(struct in_addr *) &dsin->sin_addr, daddr); + printf("proto=%d %s\n", proto, daddr); + } + +} +#endif + static int ipv4_mbuf_demarshal(struct flowtable *ft, struct mbuf *m, struct sockaddr_in *ssin, struct sockaddr_in *dsin, uint16_t *flags) @@ -513,17 +534,8 @@ skipports: ssin->sin_port = sport; dsin->sin_port = dport; #ifdef FLOWTABLE_DEBUG - if (*flags & (FL_HASH_ALL|FL_DEBUG_ALL)) { - char saddr[4*sizeof "123"], daddr[4*sizeof "123"]; - inet_ntoa_r(*(struct in_addr *) &ip->ip_dst, daddr); - inet_ntoa_r(*(struct in_addr *) &ip->ip_src, saddr); - FLDPRINTF(ft, FL_DEBUG_ALL, "proto=%d %s:%d->%s:%d\n", - proto, saddr, ntohs(sport), daddr, ntohs(dport)); - } else { - char daddr[4*sizeof "123"]; - inet_ntoa_r(*(struct in_addr *) &ip->ip_dst, daddr); - FLDPRINTF(ft, FL_DEBUG_ALL, "proto=%d %s\n", proto, daddr); - } + if (*flags & FL_DEBUG_ALL) + ipv4_flow_print_tuple(*flags, proto, ssin, dsin); #endif return (0); } @@ -954,6 +966,11 @@ kern_flowtable_insert(struct flowtable * FLDPRINTF(ft, FL_DEBUG, "kern_flowtable_insert: hash=0x%x fibnum=%d flags=0x%x\n", hash, fibnum, flags); +#ifdef FLOWTABLE_DEBUG + if (*flags & FL_DEBUG) + ipv4_flow_print_tuple(flags, flags_to_proto(flags), + (struct sockaddr_in *)&ssa, (struct sockaddr_in *)&dsa); +#endif return (flowtable_insert(ft, hash, key, fibnum, ro, flags)); }