From owner-freebsd-bugs@FreeBSD.ORG  Wed Oct  5 23:10:16 2005
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
X-Original-To: freebsd-bugs@hub.freebsd.org
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2AD0716A41F
	for <freebsd-bugs@hub.freebsd.org>;
	Wed,  5 Oct 2005 23:10:16 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 31D4E43D48
	for <freebsd-bugs@hub.freebsd.org>;
	Wed,  5 Oct 2005 23:10:15 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j95NAEFw060149
	for <freebsd-bugs@freefall.freebsd.org>; Wed, 5 Oct 2005 23:10:14 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j95NAEU3060148;
	Wed, 5 Oct 2005 23:10:14 GMT (envelope-from gnats)
Resent-Date: Wed, 5 Oct 2005 23:10:14 GMT
Resent-Message-Id: <200510052310.j95NAEU3060148@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Remigiusz Hajduk <rhajduk@gmail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 72C3F16A43A
	for <freebsd-gnats-submit@FreeBSD.org>;
	Wed,  5 Oct 2005 23:00:40 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 468E143D45
	for <freebsd-gnats-submit@FreeBSD.org>;
	Wed,  5 Oct 2005 23:00:40 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j95N0e0D075966
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 5 Oct 2005 23:00:40 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id j95N0dGE075965;
	Wed, 5 Oct 2005 23:00:39 GMT (envelope-from nobody)
Message-Id: <200510052300.j95N0dGE075965@www.freebsd.org>
Date: Wed, 5 Oct 2005 23:00:39 GMT
From: Remigiusz Hajduk <rhajduk@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-2.3
Cc: 
Subject: kern/86957: [PATCH] ipfw mac logging
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Oct 2005 23:10:16 -0000


>Number:         86957
>Category:       kern
>Synopsis:       [PATCH] ipfw mac logging
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 05 23:10:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Remigiusz Hajduk
>Release:        5.4-RELEASE
>Organization:
home
>Environment:
FreeBSD devel 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Sun May  8 10:21:06 UTC 2005     root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 
>Description:
              I added MAC address logging facility.
I think that it is useful and should be committed.
>How-To-Repeat:
              
>Fix:
--- sys/netinet/ip_fw2.c.orig   Tue Oct  4 23:06:20 2005
+++ sys/netinet/ip_fw2.c        Tue Oct  4 23:06:21 2005
@@ -665,7 +665,25 @@
        }
 
        if (hlen == 0) {        /* non-ip */
-               snprintf(SNPARGS(proto, 0), "MAC");
+               int len, i;
+               u_char *ptr;
+
+               len = snprintf(SNPARGS(proto, 0), "MAC ");
+
+               i = ETHER_ADDR_LEN;
+               ptr = eh->ether_dhost;
+
+               do {
+                       len += snprintf(SNPARGS(proto, len), "%s%02x", (i==ETHER_ADDR_LEN) ? "" : ":", *ptr++);
+               } while(--i > 0);
+
+               i = ETHER_ADDR_LEN;
+               ptr = eh->ether_shost;
+               len += snprintf(SNPARGS(proto, len), " ");
+               do {
+                       len += snprintf(SNPARGS(proto, len), "%s%02x", (i==ETHER_ADDR_LEN) ? "" : ":", *ptr++);
+               } while(--i > 0);
+
        } else {
                struct ip *ip = mtod(m, struct ip *);
                /* these three are all aliases to the same thing */

>Release-Note:
>Audit-Trail:
>Unformatted: