From owner-p4-projects@FreeBSD.ORG  Mon Jan 19 09:57:14 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B92116A4D0; Mon, 19 Jan 2004 09:57:14 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7521416A4CE
	for <perforce@freebsd.org>; Mon, 19 Jan 2004 09:57:14 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6C4FD43D1D
	for <perforce@freebsd.org>; Mon, 19 Jan 2004 09:57:13 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0JHvD0B086857
	for <perforce@freebsd.org>; Mon, 19 Jan 2004 09:57:13 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0JHvDH7086854
	for perforce@freebsd.org; Mon, 19 Jan 2004 09:57:13 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Mon, 19 Jan 2004 09:57:13 -0800 (PST)
Message-Id: <200401191757.i0JHvDH7086854@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45602 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2004 17:57:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=45602

Change 45602 by sam@sam_ebb on 2004/01/19 09:56:28

	remove debugging stuff unintentionally brought in during merge

Affected files ...

.. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#3 edit

Differences ...

==== //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#3 (text+ko) ====

@@ -74,8 +74,6 @@
 #define		DEBUG_EXPIRE	0x08
 #define		DEBUG_XMIT	0x10
 #define		DEBUG_PIM	0x20
-SYSCTL_INT(_net_inet_ip, OID_AUTO, mrtdebug, CTLFLAG_RW,
-	&mrtdebug, 0, "multicast routing debug control");
 
 #define		VIFI_INVALID	((vifi_t) -1)
 
@@ -614,27 +612,17 @@
 ip_mrouter_init(struct socket *so, int version)
 {
     if (mrtdebug)
-	log(LOG_DEBUG, "%s: so_type = %d, pr_protocol = %d\n", __func__,
+	log(LOG_DEBUG, "ip_mrouter_init: so_type = %d, pr_protocol = %d\n",
 	    so->so_type, so->so_proto->pr_protocol);
 
-    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_IGMP) {
-	if (mrtdebug)
-	    log(LOG_DEBUG, "%s: invalid socket, type %u protocol %u\n",
-		__func__, so->so_type, so->so_proto->pr_protocol);
+    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_IGMP)
 	return EOPNOTSUPP;
-    }
 
-    if (version != 1) {
-	if (mrtdebug)
-	    log(LOG_DEBUG, "%s: bad version %u, expecting 1\n",
-		__func__, version);
+    if (version != 1)
 	return ENOPROTOOPT;
-    }
 
     mtx_lock(&mrouter_mtx);
 
-    mtx_lock(&mrouter_mtx);
-
     if (ip_mrouter != NULL) {
 	mtx_unlock(&mrouter_mtx);
 	return EADDRINUSE;
@@ -651,7 +639,7 @@
     mtx_unlock(&mrouter_mtx);
 
     if (mrtdebug)
-	log(LOG_DEBUG, "%s: done\n", __func__);
+	log(LOG_DEBUG, "ip_mrouter_init\n");
 
     return 0;
 }
@@ -757,7 +745,7 @@
     mtx_unlock(&mrouter_mtx);
 
     if (mrtdebug)
-	log(LOG_DEBUG, "%s: end\n", __func__);
+	log(LOG_DEBUG, "ip_mrouter_done\n");
 
     return 0;
 }