PERFORCE change 122600 for review

[Peter Wemm]

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

Change 122600 by peter at 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);