From owner-svn-src-user@FreeBSD.ORG Mon Jan 4 10:39:16 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 BDBB4106566C; Mon, 4 Jan 2010 10:39:16 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 949408FC14; Mon, 4 Jan 2010 10:39:16 +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 o04AdGhj031777; Mon, 4 Jan 2010 10:39:16 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o04AdGOf031775; Mon, 4 Jan 2010 10:39:16 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201001041039.o04AdGOf031775@svn.freebsd.org> From: Luigi Rizzo Date: Mon, 4 Jan 2010 10:39:16 +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: r201486 - user/luigi/ipfw3-head/sys/netinet 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: Mon, 04 Jan 2010 10:39:16 -0000 Author: luigi Date: Mon Jan 4 10:39:16 2010 New Revision: 201486 URL: http://svn.freebsd.org/changeset/base/201486 Log: remove debugging messages Modified: user/luigi/ipfw3-head/sys/netinet/ip_divert.c Modified: user/luigi/ipfw3-head/sys/netinet/ip_divert.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ip_divert.c Mon Jan 4 10:38:54 2010 (r201485) +++ user/luigi/ipfw3-head/sys/netinet/ip_divert.c Mon Jan 4 10:39:16 2010 (r201486) @@ -220,7 +220,6 @@ divert_packet(struct mbuf *m, int incomi mtag = m_tag_find(m, PACKET_TAG_DIVERT, NULL); if (mtag == NULL) { - printf("%s: no divert tag\n", __func__); m_freem(m); return; } @@ -301,9 +300,6 @@ divert_packet(struct mbuf *m, int incomi /* Put packet on socket queue, if any */ sa = NULL; nport = htons((u_int16_t)divert_info(mtag)); - printf("divert rule %d %s to port %d\n", divsrc.sin_port, - incoming ? "in" : "out", - ntohs(nport)); INP_INFO_RLOCK(&V_divcbinfo); LIST_FOREACH(inp, &V_divcb, inp_list) { /* XXX why does only one socket match? */ @@ -360,7 +356,6 @@ div_output(struct socket *so, struct mbu mtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL); if (mtag == NULL) { /* this should be normal */ - printf("create divert tag\n"); mtag = m_tag_alloc(MTAG_IPFW_RULE, 0, sizeof(struct ipfw_rule_ref), M_NOWAIT | M_ZERO); if (mtag == NULL) { @@ -371,9 +366,6 @@ div_output(struct socket *so, struct mbu } dt = (struct ipfw_rule_ref *)(mtag+1); - printf("%s sin %p dst rule %d addr 0x%x\n", __FUNCTION__, - sin, sin? sin->sin_port : -1, - sin ? sin->sin_addr.s_addr : 0xdeaddead); /* Loopback avoidance and state recovery */ if (sin) { int i; @@ -470,7 +462,6 @@ div_output(struct socket *so, struct mbu } } else { dt->info |= IP_FW_DIVERT_LOOPBACK_FLAG; - printf("divert to loopback\n"); if (m->m_pkthdr.rcvif == NULL) { /* * No luck with the name, check by IP address. @@ -483,7 +474,6 @@ div_output(struct socket *so, struct mbu sin->sin_port = 0; ifa = ifa_ifwithaddr((struct sockaddr *) sin); if (ifa == NULL) { - printf("%s ifa not found ???\n", __FUNCTION__); error = EADDRNOTAVAIL; goto cantsend; }