Sync with recent KAME.

This work was based on kame-20010528-freebsd43-snap.tgz and some
critical problem after the snap was out were fixed.
There are many many changes since last KAME merge.

TODO:
  - The definitions of SADB_* in sys/net/pfkeyv2.h are still different
    from RFC2407/IANA assignment because of binary compatibility
    issue.  It should be fixed under 5-CURRENT.
  - ip6po_m member of struct ip6_pktopts is no longer used.  But, it
    is still there because of binary compatibility issue.  It should
    be removed under 5-CURRENT.

Reviewed by:	itojun
Obtained from:	KAME
MFC after:	3 weeks

1 files changed, 74 insertions, 4 deletions

diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c
index b1e1c1e..e729e7d 100644
--- a/sbin/setkey/setkey.c
+++ b/sbin/setkey/setkey.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD$	*/
-/*	$KAME: setkey.c,v 1.14 2000/06/10 06:47:09 sakane Exp $	*/
+/*	$KAME: setkey.c,v 1.18 2001/05/08 04:36:39 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -63,6 +63,8 @@ int postproc __P((struct sadb_msg *, int));
 const char *numstr __P((int));
 void shortdump_hdr __P((void));
 void shortdump __P((struct sadb_msg *));
+static void printdate __P((void));
+static int32_t gmt2local __P((time_t));
 
 #define MODE_SCRIPT	1
 #define MODE_CMDDUMP	2
@@ -79,11 +81,14 @@ int f_mode = 0;
 int f_cmddump = 0;
 int f_policy = 0;
 int f_hexdump = 0;
+int f_tflag = 0;
 char *pname;
 
 u_char m_buf[BUFSIZ];
 u_int m_len;
 
+static time_t thiszone;
+
 extern int lineno;
 
 extern int parse __P((FILE **));
@@ -112,7 +117,9 @@ main(ac, av)
 
 	if (ac == 1) Usage();
 
-	while ((c = getopt(ac, av, "acdf:hlvxDFP")) != EOF) {
+	thiszone = gmt2local(0);
+
+	while ((c = getopt(ac, av, "acdf:hlvxDFP")) != -1) {
 		switch (c) {
 		case 'c':
 			f_mode = MODE_SCRIPT;
@@ -142,6 +149,7 @@ main(ac, av)
 			break;
 		case 'x':
 			f_mode = MODE_PROMISC;
+			f_tflag++;
 			break;
 		case 'P':
 			f_policy = 1;
@@ -199,7 +207,7 @@ get_supported()
 	if (f_debug)
 		return 0;
 
-	if (pfkey_send_register(so, PF_UNSPEC) < 0)
+	if (pfkey_send_register(so, SADB_SATYPE_UNSPEC) < 0)
 		return -1;
 
 	if (pfkey_recv_register(so) < 0)
@@ -275,6 +283,7 @@ promisc()
 			err(1, "recv");
 			/*NOTREACHED*/
 		}
+		printdate();
 		if (f_hexdump) {
 			int i;
 			for (i = 0; i < len; i++) {
@@ -541,7 +550,7 @@ shortdump(msg)
 			snprintf(buf, sizeof(buf), "%-3lu", (u_long)t);
 		printf("%s", buf);
 	} else
-		printf(" ???/???");
+		printf(" ??\?/???");	/* backslash to avoid trigraph ??/ */
 
 	printf(" ");
 
@@ -576,3 +585,64 @@ shortdump(msg)
 
 	printf("\n");
 }
+
+/* From: tcpdump(1):gmt2local.c and util.c */
+/*
+ * Print the timestamp
+ */
+static void
+printdate()
+{
+	struct timeval tp;
+	int s;
+
+	if (gettimeofday(&tp, NULL) == -1) {
+		perror("gettimeofday");
+		return;
+	}
+
+	if (f_tflag == 1) {
+		/* Default */
+		s = (tp.tv_sec + thiszone ) % 86400;
+		(void)printf("%02d:%02d:%02d.%06u ",
+		    s / 3600, (s % 3600) / 60, s % 60, (u_int32_t)tp.tv_usec);
+	} else if (f_tflag > 1) {
+		/* Unix timeval style */
+		(void)printf("%u.%06u ",
+		    (u_int32_t)tp.tv_sec, (u_int32_t)tp.tv_usec);
+	}
+
+	printf("\n");
+}
+
+/*
+ * Returns the difference between gmt and local time in seconds.
+ * Use gmtime() and localtime() to keep things simple.
+ */
+int32_t
+gmt2local(time_t t)
+{
+	register int dt, dir;
+	register struct tm *gmt, *loc;
+	struct tm sgmt;
+
+	if (t == 0)
+		t = time(NULL);
+	gmt = &sgmt;
+	*gmt = *gmtime(&t);
+	loc = localtime(&t);
+	dt = (loc->tm_hour - gmt->tm_hour) * 60 * 60 +
+	    (loc->tm_min - gmt->tm_min) * 60;
+
+	/*
+	 * If the year or julian day is different, we span 00:00 GMT
+	 * and must add or subtract a day. Check the year first to
+	 * avoid problems when the julian day wraps.
+	 */
+	dir = loc->tm_year - gmt->tm_year;
+	if (dir == 0)
+		dir = loc->tm_yday - gmt->tm_yday;
+	dt += dir * 24 * 60 * 60;
+
+	return (dt);
+}