From owner-cvs-all@FreeBSD.ORG Fri May 18 20:00:39 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 87B9516A404 for ; Fri, 18 May 2007 20:00:39 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.freebsd.org (Postfix) with ESMTP id E75ED13C44C for ; Fri, 18 May 2007 20:00:38 +0000 (UTC) (envelope-from andre@freebsd.org) Received: (qmail 97978 invoked from network); 18 May 2007 19:18:48 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 18 May 2007 19:18:48 -0000 Message-ID: <464E05E5.5070704@freebsd.org> Date: Fri, 18 May 2007 22:00:37 +0200 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.10 (Windows/20070221) MIME-Version: 1.0 To: Andre Oppermann References: <200705181958.l4IJwbOb044945@repoman.freebsd.org> In-Reply-To: <200705181958.l4IJwbOb044945@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/netinet tcp.h tcp_input.c tcp_subr.c tcp_var.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2007 20:00:39 -0000 Andre Oppermann wrote: > andre 2007-05-18 19:58:37 UTC > > FreeBSD src repository > > Modified files: > sys/netinet tcp.h tcp_input.c tcp_subr.c tcp_var.h > Log: > Add tcp_log_addrs() function to generate and standardized TCP log line > for use thoughout the tcp subsystem. > > It is IPv4 and IPv6 aware creates a line in the following format: > > "TCP: [1.2.3.4]:50332 to [1.2.3.4]:80 tcpflags " > > A "\n" is not included at the end. The caller is supposed to add > further information after the standard tcp log header. > > The function returns a NUL terminated string which the caller has > to free(s, M_TCPLOG) after use. All memory allocation is done > with M_NOWAIT and the return value may be NULL in memory shortage > situations. > > Either struct in_conninfo || (struct tcphdr && (struct ip || struct > ip6_hdr) have to be supplied. > > Due to ip[6].h header inclusion limitations and ordering issues the > struct ip and struct ip6_hdr parameters have to be casted and passed > as void * pointers. > > tcp_log_addrs(struct in_conninfo *inc, struct tcphdr *th, void *ip4hdr, > void *ip6hdr) > > Usage example: > > struct ip *ip; > char *tcplog; > > if (tcplog = tcp_log_addrs(NULL, th, (void *)ip, NULL)) { > log(LOG_DEBUG, "%s; %s: Connection attempt to closed port\n", > tcplog, __func__); > free(s, M_TCPLOG); Oops, free(tcplog, M_TCPLOG) obviously. -- Andre