From owner-p4-projects@FreeBSD.ORG  Sun Jul  1 01:58:04 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 07D4C16A468; Sun,  1 Jul 2007 01:58:04 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B96B616A400
	for <perforce@freebsd.org>; Sun,  1 Jul 2007 01:58:03 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A9AB213C45D
	for <perforce@freebsd.org>; Sun,  1 Jul 2007 01:58:03 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l611w3nf033046
	for <perforce@freebsd.org>; Sun, 1 Jul 2007 01:58:03 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l611w3NV033043
	for perforce@freebsd.org; Sun, 1 Jul 2007 01:58:03 GMT
	(envelope-from peter@freebsd.org)
Date: Sun, 1 Jul 2007 01:58:03 GMT
Message-Id: <200707010158.l611w3NV033043@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122600 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 01 Jul 2007 01:58:04 -0000

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

Change 122600 by peter@peter_melody on 2007/07/01 01:57:41

	Fix compile error without INET6

Affected files ...

.. //depot/projects/hammer/sys/netinet/tcp_input.c#73 edit
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#65 edit
.. //depot/projects/hammer/sys/netinet/tcp_var.h#43 edit

Differences ...

==== //depot/projects/hammer/sys/netinet/tcp_input.c#73 (text+ko) ====

@@ -480,7 +480,7 @@
 		if ((tcp_log_in_vain == 1 && (thflags & TH_SYN)) ||
 		    tcp_log_in_vain == 2) {
 			if ((s = tcp_log_addrs(NULL, th, (void *)ip,
-			    (void *)ip6)))
+			    (const void *)ip6)))
 				log(LOG_INFO, "%s; %s: Connection attempt "
 				    "to closed port\n", s, __func__);
 		}

==== //depot/projects/hammer/sys/netinet/tcp_subr.c#65 (text+ko) ====

@@ -2075,15 +2075,15 @@
  */
 char *
 tcp_log_addrs(struct in_conninfo *inc, struct tcphdr *th, void *ip4hdr,
-    void *ip6hdr)
+    const void *ip6hdr)
 {
 	char *s, *sp;
 	size_t size;
 	struct ip *ip;
 #ifdef INET6
-	struct ip6_hdr *ip6;
+	const struct ip6_hdr *ip6;
 
-	ip6 = (struct ip6_hdr *)ip6hdr;
+	ip6 = (const struct ip6_hdr *)ip6hdr;
 #endif /* INET6 */
 	ip = (struct ip *)ip4hdr;
 

==== //depot/projects/hammer/sys/netinet/tcp_var.h#43 (text+ko) ====

@@ -523,7 +523,7 @@
 void	 tcp_init(void);
 void	 tcp_fini(void *);
 char 	*tcp_log_addrs(struct in_conninfo *, struct tcphdr *, void *,
-	    void *);
+	    const void *);
 int	 tcp_reass(struct tcpcb *, struct tcphdr *, int *, struct mbuf *);
 void	 tcp_reass_init(void);
 void	 tcp_input(struct mbuf *, int);