CVS commit: src
Module Name:src
Committed By: is
Date: Wed Nov 18 12:49:52 UTC 2020
Modified Files:
src/include/arpa: nameser_compat.h
src/lib/libc/net: getaddrinfo.c gethnamaddr.c
Log Message:
Don't complain about additional DNAME records received when resolving A or
(like already done for SIG/KEY and CNAME).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/include/arpa/nameser_compat.h
cvs rdiff -u -r1.119 -r1.120 src/lib/libc/net/getaddrinfo.c
cvs rdiff -u -r1.92 -r1.93 src/lib/libc/net/gethnamaddr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/arpa/nameser_compat.h
diff -u src/include/arpa/nameser_compat.h:1.7 src/include/arpa/nameser_compat.h:1.8
--- src/include/arpa/nameser_compat.h:1.7 Sun Jun 28 02:16:19 2020
+++ src/include/arpa/nameser_compat.h Wed Nov 18 12:49:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nameser_compat.h,v 1.7 2020/06/28 02:16:19 gutteridge Exp $ */
+/* $NetBSD: nameser_compat.h,v 1.8 2020/11/18 12:49:52 is Exp $ */
/* Copyright (c) 1983, 1989
*The Regents of the University of California. All rights reserved.
@@ -210,6 +210,7 @@ typedef struct {
#define T_ATMA ns_t_atma
#define T_NAPTR ns_t_naptr
#define T_A6 ns_t_a6
+#define T_DNAME ns_t_dname
#define T_TSIG ns_t_tsig
#define T_IXFR ns_t_ixfr
#define T_AXFR ns_t_axfr
Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.119 src/lib/libc/net/getaddrinfo.c:1.120
--- src/lib/libc/net/getaddrinfo.c:1.119 Thu Dec 13 04:41:41 2018
+++ src/lib/libc/net/getaddrinfo.c Wed Nov 18 12:49:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.119 2018/12/13 04:41:41 dholland Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.120 2020/11/18 12:49:52 is Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,7 +55,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.119 2018/12/13 04:41:41 dholland Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.120 2020/11/18 12:49:52 is Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef RUMP_ACTION
@@ -1821,7 +1821,7 @@ getanswer(res_state res, const querybuf
continue;
}
} else if (type != qtype) {
- if (type != T_KEY && type != T_SIG) {
+ if (type != T_KEY && type != T_SIG && type != T_DNAME) {
struct syslog_data sd = SYSLOG_DATA_INIT;
syslog_r(LOG_NOTICE|LOG_AUTH, ,
"gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
Index: src/lib/libc/net/gethnamaddr.c
diff -u src/lib/libc/net/gethnamaddr.c:1.92 src/lib/libc/net/gethnamaddr.c:1.93
--- src/lib/libc/net/gethnamaddr.c:1.92 Tue Sep 22 16:16:02 2015
+++ src/lib/libc/net/gethnamaddr.c Wed Nov 18 12:49:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gethnamaddr.c,v 1.92 2015/09/22 16:16:02 christos Exp $ */
+/* $NetBSD: gethnamaddr.c,v 1.93 2020/11/18 12:49:52 is Exp $ */
/*
* ++Copyright++ 1985, 1988, 1993
@@ -57,7 +57,7 @@
static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: gethnamaddr.c,v 8.21 1997/06/01 20:34:37 vixie Exp ";
#else
-__RCSID("$NetBSD: gethnamaddr.c,v 1.92 2015/09/22 16:16:02 christos Exp $");
+__RCSID("$NetBSD: gethnamaddr.c,v 1.93 2020/11/18 12:49:52 is Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -358,7 +358,7 @@ getanswer(const querybuf *answer, int an
continue;
}
if (type != qtype) {
- if (type != T_KEY && type != T_SIG)
+ if (type != T_KEY && type != T_SIG && type != T_DNAME)
syslog(LOG_NOTICE|LOG_AUTH,
"gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
qname, p_class(C_IN), p_type(qtype),
CVS commit: src/share/misc
Module Name:src Committed By: is Date: Sun Apr 19 15:58:53 UTC 2020 Modified Files: src/share/misc: inter.phone Log Message: New Greek National Numbering Plan, according to the EETT decision published in the Greek Government Gazette 127 B/8.2.2001 To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/share/misc/inter.phone Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/inter.phone diff -u src/share/misc/inter.phone:1.32 src/share/misc/inter.phone:1.33 --- src/share/misc/inter.phone:1.32 Wed Mar 4 22:24:46 2020 +++ src/share/misc/inter.phone Sun Apr 19 15:58:53 2020 @@ -1,5 +1,5 @@ # Country Code : City Code : City : Country -# $NetBSD: inter.phone,v 1.32 2020/03/04 22:24:46 fcambus Exp $ +# $NetBSD: inter.phone,v 1.33 2020/04/19 15:58:53 is Exp $ # @(#)inter.phone 8.1 (Berkeley) 6/9/93 7:317:Akmola:Republic of Kazakhstan 7:329:Aktau:Republic of Kazakhstan @@ -50,19 +50,19 @@ 27:21:Cape Town:South Africa 27:31:Durban:South Africa 27:51:Bloemfontein:South Africa -30:1:Athens:Greece -30:1:Piraeus:Greece -30:241:Rhodes:Greece -30:31:Thessaloniki:Greece -30:321:Serrai:Greece -30:41:Larissa:Greece -30:421:Volos:Greece -30:51:Kavala:Greece -30:521:Drama:Greece -30:61:Patrai:Greece -30:651:Ioannina:Greece -30:721:Kalamata:Greece -30:81:Iraklion (Crete):Greece +30:21:Athens:Greece +30:21:Piraeus:Greece +30:2241:Rhodes:Greece +30:231:Thessaloniki:Greece +30:2321:Serrai:Greece +30:241:Larissa:Greece +30:2421:Volos:Greece +30:251:Kavala:Greece +30:2521:Drama:Greece +30:261:Patrai:Greece +30:2651:Ioannina:Greece +30:2721:Kalamata:Greece +30:281:Iraklion (Crete):Greece 31:10:Rotterdam:Netherlands 31:13:Tilburg:Netherlands 31:20:Amsterdam:Netherlands
CVS commit: [is-mlppp] src/sys/net
Module Name:src Committed By: is Date: Sat Apr 11 10:47:06 UTC 2020 Modified Files: src/sys/net [is-mlppp]: if_spppsubr.c Log Message: trying to ind the right place for MLPPP renegotiation. To generate a diff of this commit: cvs rdiff -u -r1.187.2.10 -r1.187.2.11 src/sys/net/if_spppsubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/if_spppsubr.c diff -u src/sys/net/if_spppsubr.c:1.187.2.10 src/sys/net/if_spppsubr.c:1.187.2.11 --- src/sys/net/if_spppsubr.c:1.187.2.10 Sat Apr 11 10:06:22 2020 +++ src/sys/net/if_spppsubr.c Sat Apr 11 10:47:06 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_spppsubr.c,v 1.187.2.10 2020/04/11 10:06:22 is Exp $ */ +/* $NetBSD: if_spppsubr.c,v 1.187.2.11 2020/04/11 10:47:06 is Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.10 2020/04/11 10:06:22 is Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.11 2020/04/11 10:47:06 is Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -3057,6 +3057,10 @@ sppp_lcp_tld(struct sppp *sp) (cps[i])->Close(sp); } } + + sp->lcp.mrru = sp->pp_if.if_mtu; + sp->lcp.opts |= (1 << LCP_OPT_MP_MRRU); + sp->lcp.their_mrru = 0; } static void
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Sat Apr 11 10:06:22 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppsubr.c
Log Message:
typo
To generate a diff of this commit:
cvs rdiff -u -r1.187.2.9 -r1.187.2.10 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187.2.9 src/sys/net/if_spppsubr.c:1.187.2.10
--- src/sys/net/if_spppsubr.c:1.187.2.9 Sat Apr 11 09:40:02 2020
+++ src/sys/net/if_spppsubr.c Sat Apr 11 10:06:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187.2.9 2020/04/11 09:40:02 is Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187.2.10 2020/04/11 10:06:22 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.9 2020/04/11 09:40:02 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.10 2020/04/11 10:06:22 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2950,8 +2950,8 @@ sppp_lcp_RCN_nak(struct sppp *sp, struct
u_int mrru = p[2] * 256 + p[3];
if (debug)
addlog(" %d", mrru);
-if (mrru < PPP_MINMRU || mru > sp->pp_if.if_mtu)
- mru = sp->pp_if.if_mtu;
+if (mrru < PPP_MINMRU || mrru > sp->pp_if.if_mtu)
+ mrru = sp->pp_if.if_mtu;
sp->lcp.mrru = mrru;
sp->lcp.opts |= (1 << LCP_OPT_MP_MRRU);
}
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Sat Apr 11 09:40:02 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppsubr.c
Log Message:
MLPPP mrru negotiation.
To generate a diff of this commit:
cvs rdiff -u -r1.187.2.8 -r1.187.2.9 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187.2.8 src/sys/net/if_spppsubr.c:1.187.2.9
--- src/sys/net/if_spppsubr.c:1.187.2.8 Sat Apr 11 08:11:58 2020
+++ src/sys/net/if_spppsubr.c Sat Apr 11 09:40:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187.2.8 2020/04/11 08:11:58 is Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187.2.9 2020/04/11 09:40:02 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.8 2020/04/11 08:11:58 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.9 2020/04/11 09:40:02 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2354,7 +2354,6 @@ sppp_lcp_up(struct sppp *sp)
sp->pp_last_receive = sp->pp_last_activity = time_uptime;
/* Initialize mlppp state */
- sp->lcp.mrru = sp->lcp.their_mrru = 0;
sp->lcp.ml_prefix = NULL;
sp->lcp.ml_seq_xpctd = 0;
@@ -2434,6 +2433,10 @@ sppp_lcp_open(struct sppp *sp)
sp->lcp.mru = PP_MTU;
sp->lcp.their_mru = PP_MTU;
+ sp->lcp.mrru = sp->pp_if.if_mtu;
+ sp->lcp.opts |= (1 << LCP_OPT_MP_MRRU);
+ sp->lcp.their_mrru = 0;
+
/*
* If we are authenticator, negotiate LCP_AUTH
*/
@@ -2822,6 +2825,19 @@ sppp_lcp_RCN_rej(struct sppp *sp, struct
sp->lcp.opts &= ~(1 << LCP_OPT_MRU);
sp->lcp.mru = PP_MTU;
break;
+ case LCP_OPT_MP_MRRU:
+ /*
+ * the peer is rejecting a multilink MRRU.
+ * give up on MP in the incoming direction.
+ */
+ if (debug) {
+addlog("%s: warning: peer rejected our MRRU of "
+"%ld bytes. Defaulting to no MLPPP\n",
+ifp->if_xname, sp->lcp.mrru);
+ }
+ sp->lcp.opts &= ~(1 << LCP_OPT_MP_MRRU);
+ sp->lcp.mrru = 0;
+ break;
case LCP_OPT_AUTH_PROTO:
/*
* Peer doesn't want to authenticate himself,
@@ -2924,6 +2940,22 @@ sppp_lcp_RCN_nak(struct sppp *sp, struct
sp->lcp.opts |= (1 << LCP_OPT_MRU);
}
break;
+ case LCP_OPT_MP_MRRU:
+ /*
+ * Peer wants to advise us to negotiate an multilink MRRU.
+ * Agree on it if it's reasonable, or use
+ * default otherwise.
+ */
+ if (len >= 4 && l == 4) {
+u_int mrru = p[2] * 256 + p[3];
+if (debug)
+ addlog(" %d", mrru);
+if (mrru < PPP_MINMRU || mru > sp->pp_if.if_mtu)
+ mru = sp->pp_if.if_mtu;
+sp->lcp.mrru = mrru;
+sp->lcp.opts |= (1 << LCP_OPT_MP_MRRU);
+ }
+ break;
case LCP_OPT_AUTH_PROTO:
/*
* Peer doesn't like our authentication method,
@@ -3089,6 +3121,13 @@ sppp_lcp_scr(struct sppp *sp)
opt[i++] = sp->lcp.mru;
}
+ if (sp->lcp.opts & (1 << LCP_OPT_MP_MRRU)) {
+ opt[i++] = LCP_OPT_MP_MRRU;
+ opt[i++] = 4;
+ opt[i++] = sp->lcp.mrru >> 8;
+ opt[i++] = sp->lcp.mrru;
+ }
+
if (sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO)) {
authproto = sp->hisauth.proto;
opt[i++] = LCP_OPT_AUTH_PROTO;
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Sat Apr 11 08:11:58 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppsubr.c
Log Message:
macro error
To generate a diff of this commit:
cvs rdiff -u -r1.187.2.7 -r1.187.2.8 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187.2.7 src/sys/net/if_spppsubr.c:1.187.2.8
--- src/sys/net/if_spppsubr.c:1.187.2.7 Sat Apr 11 07:38:00 2020
+++ src/sys/net/if_spppsubr.c Sat Apr 11 08:11:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187.2.7 2020/04/11 07:38:00 is Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187.2.8 2020/04/11 08:11:58 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.7 2020/04/11 07:38:00 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.8 2020/04/11 08:11:58 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -93,7 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.
#include
#ifndef _NET_IF_STATS_H_
-#define if_statadd(ifp,member,amount) do { (ifp)->(member)+=(amount); } while (0)
+#define if_statadd(ifp,member,amount) do { (ifp)->member+=(amount); } while (0)
#define if_statadd2(ifp,m1,a1,m2,a2) do { if_statadd(ifp,m1,a1); if_statadd(ifp,m2,a2);} while(0)
#define if_statinc(ifp,member) if_statadd(ifp,member,1)
#endif
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Sat Apr 11 07:38:00 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppsubr.c
Log Message:
whitespace error
To generate a diff of this commit:
cvs rdiff -u -r1.187.2.6 -r1.187.2.7 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187.2.6 src/sys/net/if_spppsubr.c:1.187.2.7
--- src/sys/net/if_spppsubr.c:1.187.2.6 Sat Apr 11 07:28:06 2020
+++ src/sys/net/if_spppsubr.c Sat Apr 11 07:38:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187.2.6 2020/04/11 07:28:06 is Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187.2.7 2020/04/11 07:38:00 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.6 2020/04/11 07:28:06 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.7 2020/04/11 07:38:00 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -93,9 +93,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.
#include
#ifndef _NET_IF_STATS_H_
-#define if_statadd (ifp,member,amount) do { (ifp)->(member)+=(amount); } while (0)
+#define if_statadd(ifp,member,amount) do { (ifp)->(member)+=(amount); } while (0)
#define if_statadd2(ifp,m1,a1,m2,a2) do { if_statadd(ifp,m1,a1); if_statadd(ifp,m2,a2);} while(0)
-#define if_statinc (ifp,member) if_statadd(ifp,member,1)
+#define if_statinc(ifp,member) if_statadd(ifp,member,1)
#endif
#ifdef NET_MPSAFE
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Sat Apr 11 07:28:06 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppsubr.c
Log Message:
compat code to make transplanting this to netbsd-8 easier
To generate a diff of this commit:
cvs rdiff -u -r1.187.2.5 -r1.187.2.6 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187.2.5 src/sys/net/if_spppsubr.c:1.187.2.6
--- src/sys/net/if_spppsubr.c:1.187.2.5 Fri Apr 10 19:45:24 2020
+++ src/sys/net/if_spppsubr.c Sat Apr 11 07:28:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187.2.5 2020/04/10 19:45:24 is Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187.2.6 2020/04/11 07:28:06 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.5 2020/04/10 19:45:24 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.6 2020/04/11 07:28:06 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -92,6 +92,12 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.
#include
#include
+#ifndef _NET_IF_STATS_H_
+#define if_statadd (ifp,member,amount) do { (ifp)->(member)+=(amount); } while (0)
+#define if_statadd2(ifp,m1,a1,m2,a2) do { if_statadd(ifp,m1,a1); if_statadd(ifp,m2,a2);} while(0)
+#define if_statinc (ifp,member) if_statadd(ifp,member,1)
+#endif
+
#ifdef NET_MPSAFE
#define SPPPSUBR_MPSAFE 1
#endif
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Fri Apr 10 19:45:24 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppsubr.c
Log Message:
syntax fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.187.2.4 -r1.187.2.5 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187.2.4 src/sys/net/if_spppsubr.c:1.187.2.5
--- src/sys/net/if_spppsubr.c:1.187.2.4 Fri Apr 10 17:28:37 2020
+++ src/sys/net/if_spppsubr.c Fri Apr 10 19:45:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187.2.4 2020/04/10 17:28:37 is Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187.2.5 2020/04/10 19:45:24 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.4 2020/04/10 17:28:37 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.5 2020/04/10 19:45:24 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -539,7 +539,6 @@ sppp_ml_defrag(struct sppp *sp, struct m
u_int8_t flags;
u_int32_t seqid;
u_int16_t protocol;
- u_int16_t *m_protop;
int newflen;
if (*protocolp != PPP_MP)
@@ -554,7 +553,7 @@ sppp_ml_defrag(struct sppp *sp, struct m
if (m->m_len < 4) {
m = m_pullup(m, 4);
if (m == NULL) {
- if_statadd2(ifp, if_ierrors, 1, if_iqdrops, 1);
+ if_statadd2(>pp_if, if_ierrors, 1, if_iqdrops, 1);
return NULL;
}
}
@@ -569,15 +568,15 @@ sppp_ml_defrag(struct sppp *sp, struct m
if (flags & 0x80) {
/* Beginning fragment. */
- sp->lcp.ml_seq_expected=seqid+1; /* next expected */
+ sp->lcp.ml_seq_xpctd=seqid+1; /* next expected */
/* TODO: if prefix, count dropped? */
m_freem(sp->lcp.ml_prefix);
sp->lcp.ml_prefix = m;
- } else if (seqid == sp->lcp.ml_seq_expected) {
- sp->lcp.ml_seq_expected=seqid+1; /* next expected */
+ } else if (seqid == sp->lcp.ml_seq_xpctd) {
+ sp->lcp.ml_seq_xpctd=seqid+1; /* next expected */
if (sp->lcp.ml_prefix == 0) {
/* didn't see B frame. */
/* TODO: count as dropped. */
@@ -590,7 +589,7 @@ sppp_ml_defrag(struct sppp *sp, struct m
*/
newflen = m->m_pkthdr.len;
m_cat(sp->lcp.ml_prefix, m);
- lcp.ml_prefix->m_pkthdr.len += newflen;
+ sp->lcp.ml_prefix->m_pkthdr.len += newflen;
} else {
/*
@@ -612,14 +611,14 @@ sppp_ml_defrag(struct sppp *sp, struct m
sp->lcp.ml_prefix = NULL;
if (m->m_len < 2) {
- m = m_pullup(m,2)
+ m = m_pullup(m,2);
if (m == NULL) {
- * TODO: count as dropped.
+ /* TODO: count as dropped. */
return NULL;
}
}
/* RFC 1990 2.: don't assume no protocol field compression */
- p = mtod(m, u_int8_t);
+ p = mtod(m, u_int8_t *);
protocol = *p;
if (protocol & 1) {
@@ -2351,7 +2350,7 @@ sppp_lcp_up(struct sppp *sp)
/* Initialize mlppp state */
sp->lcp.mrru = sp->lcp.their_mrru = 0;
sp->lcp.ml_prefix = NULL;
- sp->lcp.ml_seq_expected = 0;
+ sp->lcp.ml_seq_xpctd = 0;
/*
* If this interface is passive or dial-on-demand, and we are
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Fri Apr 10 17:28:37 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppsubr.c if_spppvar.h
Log Message:
first part of defragmentation code. No dropping/sequence error statistics
yet, and no MRRU negotiation so not active.
To generate a diff of this commit:
cvs rdiff -u -r1.187.2.3 -r1.187.2.4 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.22.12.2 -r1.22.12.3 src/sys/net/if_spppvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187.2.3 src/sys/net/if_spppsubr.c:1.187.2.4
--- src/sys/net/if_spppsubr.c:1.187.2.3 Tue Apr 7 19:26:44 2020
+++ src/sys/net/if_spppsubr.c Fri Apr 10 17:28:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187.2.3 2020/04/07 19:26:44 is Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187.2.4 2020/04/10 17:28:37 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.3 2020/04/07 19:26:44 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.4 2020/04/10 17:28:37 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -336,6 +336,9 @@ static void sppp_lcp_scr(struct sppp *sp
static void sppp_lcp_check_and_close(struct sppp *sp);
static int sppp_ncp_check(struct sppp *sp);
+static struct mbuf *sppp_ml_defrag(struct sppp *sp, struct mbuf *m,
+u_int16_t *protocolp);
+
static void sppp_ipcp_init(struct sppp *sp);
static void sppp_ipcp_up(struct sppp *sp);
static void sppp_ipcp_down(struct sppp *sp);
@@ -517,6 +520,123 @@ sppp_change_phase(struct sppp *sp, int p
}
}
+
+/*
+ * Defragment an MP packet.
+ *
+ * Returns NULL or an assembled packet or the original,
+ * and adjusts the passed protocol to the inner one.
+ *
+ * Called with and returns a packet without PPP header,
+ * but with MP fragment header.
+ *
+ * Called and returns with lock held.
+ */
+static struct mbuf *
+sppp_ml_defrag(struct sppp *sp, struct mbuf *m, u_int16_t *protocolp)
+{
+ u_int8_t *p;
+ u_int8_t flags;
+ u_int32_t seqid;
+ u_int16_t protocol;
+ u_int16_t *m_protop;
+ int newflen;
+
+ if (*protocolp != PPP_MP)
+ return m; /* not ours */
+
+ if (sp->lcp.mrru == 0)
+ return m; /*
+ * ours, but we're not ready.
+ * sppp_input will arrange for rejection.
+ */
+
+ if (m->m_len < 4) {
+ m = m_pullup(m, 4);
+ if (m == NULL) {
+ if_statadd2(ifp, if_ierrors, 1, if_iqdrops, 1);
+ return NULL;
+ }
+ }
+ p = mtod(m, u_int8_t *);
+ flags = *p;
+ seqid = (p[1]<<16) + (p[2]<<8) + p[3];
+
+ m_adj(m, 4);
+
+ /* We're manipulating the defragmentation state below: */
+ SPPP_UPGRADE(sp);
+
+ if (flags & 0x80) {
+ /* Beginning fragment. */
+ sp->lcp.ml_seq_expected=seqid+1; /* next expected */
+
+ /* TODO: if prefix, count dropped? */
+
+ m_freem(sp->lcp.ml_prefix);
+ sp->lcp.ml_prefix = m;
+
+ } else if (seqid == sp->lcp.ml_seq_expected) {
+ sp->lcp.ml_seq_expected=seqid+1; /* next expected */
+ if (sp->lcp.ml_prefix == 0) {
+ /* didn't see B frame. */
+ /* TODO: count as dropped. */
+ m_freem(m);
+ return NULL;
+ }
+ /*
+ * m_cat might free the first mbuf (with pkthdr)
+ * in 2nd chain; therefore:
+ */
+ newflen = m->m_pkthdr.len;
+ m_cat(sp->lcp.ml_prefix, m);
+ lcp.ml_prefix->m_pkthdr.len += newflen;
+
+ } else {
+ /*
+ * sequence error.
+ *
+ * For now, only drop this fragment, and don't touch state-
+ * might be from the long past or future, and we could still
+ * finish our current prefix.
+ *
+ * TODO: count as dropped.
+ */
+ m_freem(sp->lcp.ml_prefix);
+ return NULL;
+ }
+ /* Successfully got the Beginning or appended a non-B packet.*/
+ if (flags & 0x40) {
+ /* B/next was E packet. Unwrap gift and deliver. */
+ m = sp->lcp.ml_prefix;
+ sp->lcp.ml_prefix = NULL;
+
+ if (m->m_len < 2) {
+ m = m_pullup(m,2)
+ if (m == NULL) {
+ * TODO: count as dropped.
+return NULL;
+ }
+ }
+ /* RFC 1990 2.: don't assume no protocol field compression */
+ p = mtod(m, u_int8_t);
+ protocol = *p;
+
+ if (protocol & 1) {
+ m_adj(m, 1);
+ } else {
+ protocol = (protocol << 8) + p[1];
+ m_adj(m, 2);
+ }
+ *protocolp = protocol;
+
+ return m;
+ }
+
+ return NULL;
+}
+
+
/*
* Exported functions, comprising our interface to the lower layer.
*/
@@ -627,6 +747,12 @@ sppp_input(struct ifnet *ifp, struct mbu
protocol = ntohs(h->protocol);
}
+ m = sppp_ml_defrag(sp, m, );
+ if (m == 0) {
+ SPPP_UNLOCK(sp);
+ return;
+ }
+
switch (protocol) {
default:
if (sp->state[IDX_LCP] == STATE_OPENED) {
@@ -,6 +2348,11 @@ sppp_lcp_up(struct sppp *sp)
/* Initialize activity timestamp: opening a connection is an activity */
sp->pp_last_receive = sp->pp_last_activity = time_uptime;
+ /* Initialize mlppp state */
+ sp->lcp.mrru = sp->lcp.their_mrru = 0;
+ sp->lcp.ml_prefix
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Tue Apr 7 19:26:45 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppsubr.c
Log Message:
The specification calls this a class, not type.
To generate a diff of this commit:
cvs rdiff -u -r1.187.2.2 -r1.187.2.3 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187.2.2 src/sys/net/if_spppsubr.c:1.187.2.3
--- src/sys/net/if_spppsubr.c:1.187.2.2 Tue Apr 7 18:32:20 2020
+++ src/sys/net/if_spppsubr.c Tue Apr 7 19:26:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187.2.2 2020/04/07 18:32:20 is Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187.2.3 2020/04/07 19:26:44 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.2 2020/04/07 18:32:20 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.3 2020/04/07 19:26:44 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2575,7 +2575,7 @@ sppp_lcp_RCR(struct sppp *sp, struct lcp
* but ignored by now.
*/
if (debug) {
-addlog(" type %d", p[2]);
+addlog(" class %d", p[2]);
sppp_print_bytes(p+3, p[1]-3);
}
continue;
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Tue Apr 7 18:47:43 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppvar.h
Log Message:
fix typo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.22.12.1 -r1.22.12.2 src/sys/net/if_spppvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppvar.h
diff -u src/sys/net/if_spppvar.h:1.22.12.1 src/sys/net/if_spppvar.h:1.22.12.2
--- src/sys/net/if_spppvar.h:1.22.12.1 Tue Apr 7 18:32:20 2020
+++ src/sys/net/if_spppvar.h Tue Apr 7 18:47:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppvar.h,v 1.22.12.1 2020/04/07 18:32:20 is Exp $ */
+/* $NetBSD: if_spppvar.h,v 1.22.12.2 2020/04/07 18:47:43 is Exp $ */
#ifndef _NET_IF_SPPPVAR_H_
#define _NET_IF_SPPPVAR_H_
@@ -47,7 +47,7 @@ struct slcp {
int max_failure;
/* multilink variables */
u_long mrru; /* our max received reconstructed unit */
- u_long their_mrru; /* their max receive dreconstructed unit */
+ u_long their_mrru; /* their max received reconstructed unit */
};
#define IDX_IPCP 1 /* idx into state table */
CVS commit: [is-mlppp] src/sys/net
Module Name:src Committed By: is Date: Tue Apr 7 18:35:01 UTC 2020 Modified Files: src/sys/net [is-mlppp]: ppp_defs.h Log Message: Multilink fragment protocol type. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.106.1 src/sys/net/ppp_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/ppp_defs.h diff -u src/sys/net/ppp_defs.h:1.13 src/sys/net/ppp_defs.h:1.13.106.1 --- src/sys/net/ppp_defs.h:1.13 Wed Feb 20 17:05:53 2008 +++ src/sys/net/ppp_defs.h Tue Apr 7 18:35:01 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ppp_defs.h,v 1.13 2008/02/20 17:05:53 matt Exp $ */ +/* $NetBSD: ppp_defs.h,v 1.13.106.1 2020/04/07 18:35:01 is Exp $ */ /* Id: ppp_defs.h,v 1.11 1997/04/30 05:46:24 paulus Exp */ /* @@ -84,6 +84,7 @@ #define PPP_IPX 0x002b /* IPX protocol */ #define PPP_VJC_COMP 0x002d /* VJ compressed TCP */ #define PPP_VJC_UNCOMP 0x002f /* VJ uncompressed TCP */ +#define PPP_MP 0x003d /* Multilink PPP Fragment */ #define PPP_IPV6 0x0057 /* Internet Protocol Version 6 */ #define PPP_COMP 0x00fd /* compressed packet */ #define PPP_IPCP 0x8021 /* IP Control Protocol */
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Tue Apr 7 18:32:20 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppsubr.c if_spppvar.h
Log Message:
Multilink PPP: sanity check of option values, storage of remote MRRU.
To generate a diff of this commit:
cvs rdiff -u -r1.187.2.1 -r1.187.2.2 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.22 -r1.22.12.1 src/sys/net/if_spppvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187.2.1 src/sys/net/if_spppsubr.c:1.187.2.2
--- src/sys/net/if_spppsubr.c:1.187.2.1 Tue Apr 7 18:28:40 2020
+++ src/sys/net/if_spppsubr.c Tue Apr 7 18:32:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187.2.1 2020/04/07 18:28:40 is Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187.2.2 2020/04/07 18:32:20 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.1 2020/04/07 18:28:40 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.2 2020/04/07 18:32:20 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2383,12 +2383,19 @@ sppp_lcp_RCR(struct sppp *sp, struct lcp
break;
case LCP_OPT_MP_EID:
if (len >= l && l >= 3) {
-if (debug)
- addlog(" [rej]");
-break;
+switch (p[2]) {
+case 0: if (l==3+ 0) continue;break;
+case 2: if (l==3+ 4) continue;break;
+case 3: if (l==3+ 6) continue;break;
+case 6: if (l==3+16) continue;break;
+case 1: /* FALLTHROUGH */
+case 4: if (l<=3+20) continue;break;
+case 5: if (l<=3+15) continue;break;
+/* XXX should it be default: continue;? */
+}
}
if (debug)
-addlog(" [invalid]");
+addlog(" [invalid class %d len %d]", p[2], l);
break;
case LCP_OPT_MP_SSNHF:
if (len >= 2 && l == 2) {
@@ -2402,15 +2409,7 @@ sppp_lcp_RCR(struct sppp *sp, struct lcp
case LCP_OPT_MP_MRRU:
/* Multilink maximum received reconstructed unit */
/* should be fall through, both are same length */
- /* for now, check, then reject anyway */
- if (len >= 4 && l == 4) {
-if (debug)
- addlog(" %d [rej]", (p[2] <<8) + p[3]);
-break;
- }
- if (debug)
-addlog(" [invalid]");
- break;
+ /* FALLTHROUGH */
case LCP_OPT_MRU:
/* Maximum receive unit. */
if (len >= 4 && l == 4)
@@ -2569,6 +2568,27 @@ sppp_lcp_RCR(struct sppp *sp, struct lcp
break;
}
continue;
+ case LCP_OPT_MP_EID:
+ /*
+ * Endpoint identification.
+ * Always agreeable,
+ * but ignored by now.
+ */
+ if (debug) {
+addlog(" type %d", p[2]);
+sppp_print_bytes(p+3, p[1]-3);
+ }
+ continue;
+ case LCP_OPT_MP_MRRU:
+ /*
+ * Maximum received reconstructed unit.
+ * Always agreeable,
+ * but ignored by now.
+ */
+ sp->lcp.their_mrru = p[2] * 256 + p[3];
+ if (debug)
+addlog(" %ld", sp->lcp.their_mrru);
+ continue;
}
if (rlen + l > blen) {
if (debug)
Index: src/sys/net/if_spppvar.h
diff -u src/sys/net/if_spppvar.h:1.22 src/sys/net/if_spppvar.h:1.22.12.1
--- src/sys/net/if_spppvar.h:1.22 Thu Oct 12 09:53:55 2017
+++ src/sys/net/if_spppvar.h Tue Apr 7 18:32:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppvar.h,v 1.22 2017/10/12 09:53:55 knakahara Exp $ */
+/* $NetBSD: if_spppvar.h,v 1.22.12.1 2020/04/07 18:32:20 is Exp $ */
#ifndef _NET_IF_SPPPVAR_H_
#define _NET_IF_SPPPVAR_H_
@@ -45,6 +45,9 @@ struct slcp {
int max_terminate;
int max_configure;
int max_failure;
+ /* multilink variables */
+ u_long mrru; /* our max received reconstructed unit */
+ u_long their_mrru; /* their max receive dreconstructed unit */
};
#define IDX_IPCP 1 /* idx into state table */
CVS commit: [is-mlppp] src/sys/net
Module Name:src
Committed By: is
Date: Tue Apr 7 18:28:40 UTC 2020
Modified Files:
src/sys/net [is-mlppp]: if_spppsubr.c
Log Message:
Define a few more LCP options. Recognize, sanity-check and report (but
still reject for the moment) multilink PPP configuration options received.
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.187.2.1 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187 src/sys/net/if_spppsubr.c:1.187.2.1
--- src/sys/net/if_spppsubr.c:1.187 Fri Mar 6 10:26:59 2020
+++ src/sys/net/if_spppsubr.c Tue Apr 7 18:28:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187 2020/03/06 10:26:59 knakahara Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187.2.1 2020/04/07 18:28:40 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187 2020/03/06 10:26:59 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187.2.1 2020/04/07 18:28:40 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -146,6 +146,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.
#define LCP_OPT_RESERVED 6 /* reserved */
#define LCP_OPT_PROTO_COMP 7 /* protocol field compression */
#define LCP_OPT_ADDR_COMP 8 /* address/control field compression */
+#define LCP_OPT_FCS_ALTS 9 /* FCS alternatives */
+#define LCP_OPT_SELF_DESC_PAD 10 /* self-describing padding */
+#define LCP_OPT_CALL_BACK 13 /* callback */
+#define LCP_OPT_COMPOUND_FRMS 15 /* compound frames */
+#define LCP_OPT_MP_MRRU 17 /* multilink MRRU */
+#define LCP_OPT_MP_SSNHF 18 /* multilink short seq. numbers */
+#define LCP_OPT_MP_EID 19 /* multilink endpoint discriminator */
#define IPCP_OPT_ADDRESSES 1 /* both IP addresses; deprecated */
#define IPCP_OPT_COMPRESSION 2 /* IP compression protocol */
@@ -2374,6 +2381,36 @@ sppp_lcp_RCR(struct sppp *sp, struct lcp
if (debug)
addlog(" [invalid]");
break;
+ case LCP_OPT_MP_EID:
+ if (len >= l && l >= 3) {
+if (debug)
+ addlog(" [rej]");
+break;
+ }
+ if (debug)
+addlog(" [invalid]");
+ break;
+ case LCP_OPT_MP_SSNHF:
+ if (len >= 2 && l == 2) {
+if (debug)
+ addlog(" [rej]");
+break;
+ }
+ if (debug)
+addlog(" [invalid]");
+ break;
+ case LCP_OPT_MP_MRRU:
+ /* Multilink maximum received reconstructed unit */
+ /* should be fall through, both are same length */
+ /* for now, check, then reject anyway */
+ if (len >= 4 && l == 4) {
+if (debug)
+ addlog(" %d [rej]", (p[2] <<8) + p[3]);
+break;
+ }
+ if (debug)
+addlog(" [invalid]");
+ break;
case LCP_OPT_MRU:
/* Maximum receive unit. */
if (len >= 4 && l == 4)
@@ -6016,6 +6053,12 @@ sppp_lcp_opt_name(u_char opt)
case LCP_OPT_MAGIC: return "magic";
case LCP_OPT_PROTO_COMP: return "proto-comp";
case LCP_OPT_ADDR_COMP: return "addr-comp";
+ case LCP_OPT_SELF_DESC_PAD: return "sdpad";
+ case LCP_OPT_CALL_BACK: return "callback";
+ case LCP_OPT_COMPOUND_FRMS: return "cmpd-frms";
+ case LCP_OPT_MP_MRRU: return "mrru";
+ case LCP_OPT_MP_SSNHF: return "mp-ssnhf";
+ case LCP_OPT_MP_EID: return "mp-eid";
}
snprintf(buf, sizeof(buf), "0x%x", opt);
return buf;
CVS commit: src/sys/net
Module Name:src Committed By: is Date: Sat Apr 4 19:46:01 UTC 2020 Modified Files: src/sys/net: ppp_defs.h Log Message: Multilink fragment protocol type. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/net/ppp_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/ppp_defs.h diff -u src/sys/net/ppp_defs.h:1.13 src/sys/net/ppp_defs.h:1.14 --- src/sys/net/ppp_defs.h:1.13 Wed Feb 20 17:05:53 2008 +++ src/sys/net/ppp_defs.h Sat Apr 4 19:46:01 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ppp_defs.h,v 1.13 2008/02/20 17:05:53 matt Exp $ */ +/* $NetBSD: ppp_defs.h,v 1.14 2020/04/04 19:46:01 is Exp $ */ /* Id: ppp_defs.h,v 1.11 1997/04/30 05:46:24 paulus Exp */ /* @@ -84,6 +84,7 @@ #define PPP_IPX 0x002b /* IPX protocol */ #define PPP_VJC_COMP 0x002d /* VJ compressed TCP */ #define PPP_VJC_UNCOMP 0x002f /* VJ uncompressed TCP */ +#define PPP_MP 0x003d /* Multilink PPP Fragment */ #define PPP_IPV6 0x0057 /* Internet Protocol Version 6 */ #define PPP_COMP 0x00fd /* compressed packet */ #define PPP_IPCP 0x8021 /* IP Control Protocol */
CVS commit: src/sys/net
Module Name:src
Committed By: is
Date: Sat Apr 4 17:12:33 UTC 2020
Modified Files:
src/sys/net: if_spppsubr.c if_spppvar.h
Log Message:
Multilink PPP: sanity check of option values, storage of remote MRRU.
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.22 -r1.23 src/sys/net/if_spppvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.188 src/sys/net/if_spppsubr.c:1.189
--- src/sys/net/if_spppsubr.c:1.188 Wed Apr 1 20:24:50 2020
+++ src/sys/net/if_spppsubr.c Sat Apr 4 17:12:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.188 2020/04/01 20:24:50 is Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.189 2020/04/04 17:12:33 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.188 2020/04/01 20:24:50 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.189 2020/04/04 17:12:33 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2383,12 +2383,19 @@ sppp_lcp_RCR(struct sppp *sp, struct lcp
break;
case LCP_OPT_MP_EID:
if (len >= l && l >= 3) {
-if (debug)
- addlog(" [rej]");
-break;
+switch (p[2]) {
+case 0: if (l==3+ 0) continue;break;
+case 2: if (l==3+ 4) continue;break;
+case 3: if (l==3+ 6) continue;break;
+case 6: if (l==3+16) continue;break;
+case 1: /* FALLTHROUGH */
+case 4: if (l<=3+20) continue;break;
+case 5: if (l<=3+15) continue;break;
+/* XXX should it be default: continue;? */
+}
}
if (debug)
-addlog(" [invalid]");
+addlog(" [invalid class %d len %d]", p[2], l);
break;
case LCP_OPT_MP_SSNHF:
if (len >= 2 && l == 2) {
@@ -2402,15 +2409,7 @@ sppp_lcp_RCR(struct sppp *sp, struct lcp
case LCP_OPT_MP_MRRU:
/* Multilink maximum received reconstructed unit */
/* should be fall through, both are same length */
- /* for now, check, then reject anyway */
- if (len >= 4 && l == 4) {
-if (debug)
- addlog(" %d [rej]", (p[2] <<8) + p[3]);
-break;
- }
- if (debug)
-addlog(" [invalid]");
- break;
+ /* FALLTHROUGH */
case LCP_OPT_MRU:
/* Maximum receive unit. */
if (len >= 4 && l == 4)
@@ -2569,6 +2568,27 @@ sppp_lcp_RCR(struct sppp *sp, struct lcp
break;
}
continue;
+ case LCP_OPT_MP_EID:
+ /*
+ * Endpoint identification.
+ * Always agreeable,
+ * but ignored by now.
+ */
+ if (debug) {
+addlog(" type %d", p[2]);
+sppp_print_bytes(p+3, p[1]-3);
+ }
+ continue;
+ case LCP_OPT_MP_MRRU:
+ /*
+ * Maximum received reconstructed unit.
+ * Always agreeable,
+ * but ignored by now.
+ */
+ sp->lcp.their_mrru = p[2] * 256 + p[3];
+ if (debug)
+addlog(" %ld", sp->lcp.their_mrru);
+ continue;
}
if (rlen + l > blen) {
if (debug)
Index: src/sys/net/if_spppvar.h
diff -u src/sys/net/if_spppvar.h:1.22 src/sys/net/if_spppvar.h:1.23
--- src/sys/net/if_spppvar.h:1.22 Thu Oct 12 09:53:55 2017
+++ src/sys/net/if_spppvar.h Sat Apr 4 17:12:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppvar.h,v 1.22 2017/10/12 09:53:55 knakahara Exp $ */
+/* $NetBSD: if_spppvar.h,v 1.23 2020/04/04 17:12:33 is Exp $ */
#ifndef _NET_IF_SPPPVAR_H_
#define _NET_IF_SPPPVAR_H_
@@ -45,6 +45,9 @@ struct slcp {
int max_terminate;
int max_configure;
int max_failure;
+ /* multilink variables */
+ u_long mrru; /* our max received reconstructed unit */
+ u_long their_mrru; /* their max receive dreconstructed unit */
};
#define IDX_IPCP 1 /* idx into state table */
CVS commit: src/sys/net
Module Name:src
Committed By: is
Date: Wed Apr 1 20:24:50 UTC 2020
Modified Files:
src/sys/net: if_spppsubr.c
Log Message:
Define a few more LCP options. Recognize, sanity-check and report (but
still reject for the moment) multilink PPP configuration options received.
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.187 src/sys/net/if_spppsubr.c:1.188
--- src/sys/net/if_spppsubr.c:1.187 Fri Mar 6 10:26:59 2020
+++ src/sys/net/if_spppsubr.c Wed Apr 1 20:24:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.187 2020/03/06 10:26:59 knakahara Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.188 2020/04/01 20:24:50 is Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187 2020/03/06 10:26:59 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.188 2020/04/01 20:24:50 is Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -146,6 +146,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.
#define LCP_OPT_RESERVED 6 /* reserved */
#define LCP_OPT_PROTO_COMP 7 /* protocol field compression */
#define LCP_OPT_ADDR_COMP 8 /* address/control field compression */
+#define LCP_OPT_FCS_ALTS 9 /* FCS alternatives */
+#define LCP_OPT_SELF_DESC_PAD 10 /* self-describing padding */
+#define LCP_OPT_CALL_BACK 13 /* callback */
+#define LCP_OPT_COMPOUND_FRMS 15 /* compound frames */
+#define LCP_OPT_MP_MRRU 17 /* multilink MRRU */
+#define LCP_OPT_MP_SSNHF 18 /* multilink short seq. numbers */
+#define LCP_OPT_MP_EID 19 /* multilink endpoint discriminator */
#define IPCP_OPT_ADDRESSES 1 /* both IP addresses; deprecated */
#define IPCP_OPT_COMPRESSION 2 /* IP compression protocol */
@@ -2374,6 +2381,36 @@ sppp_lcp_RCR(struct sppp *sp, struct lcp
if (debug)
addlog(" [invalid]");
break;
+ case LCP_OPT_MP_EID:
+ if (len >= l && l >= 3) {
+if (debug)
+ addlog(" [rej]");
+break;
+ }
+ if (debug)
+addlog(" [invalid]");
+ break;
+ case LCP_OPT_MP_SSNHF:
+ if (len >= 2 && l == 2) {
+if (debug)
+ addlog(" [rej]");
+break;
+ }
+ if (debug)
+addlog(" [invalid]");
+ break;
+ case LCP_OPT_MP_MRRU:
+ /* Multilink maximum received reconstructed unit */
+ /* should be fall through, both are same length */
+ /* for now, check, then reject anyway */
+ if (len >= 4 && l == 4) {
+if (debug)
+ addlog(" %d [rej]", (p[2] <<8) + p[3]);
+break;
+ }
+ if (debug)
+addlog(" [invalid]");
+ break;
case LCP_OPT_MRU:
/* Maximum receive unit. */
if (len >= 4 && l == 4)
@@ -6016,6 +6053,12 @@ sppp_lcp_opt_name(u_char opt)
case LCP_OPT_MAGIC: return "magic";
case LCP_OPT_PROTO_COMP: return "proto-comp";
case LCP_OPT_ADDR_COMP: return "addr-comp";
+ case LCP_OPT_SELF_DESC_PAD: return "sdpad";
+ case LCP_OPT_CALL_BACK: return "callback";
+ case LCP_OPT_COMPOUND_FRMS: return "cmpd-frms";
+ case LCP_OPT_MP_MRRU: return "mrru";
+ case LCP_OPT_MP_SSNHF: return "mp-ssnhf";
+ case LCP_OPT_MP_EID: return "mp-eid";
}
snprintf(buf, sizeof(buf), "0x%x", opt);
return buf;
CVS commit: src/etc/etc.amiga
Module Name:src
Committed By: is
Date: Sat Mar 14 16:27:19 UTC 2020
Modified Files:
src/etc/etc.amiga: Makefile.inc
Log Message:
provide both miniroot.fs (for people wanting to install NetBSD without
more 3rdparty software than what's provided on our ISO) and .fs.tz (for
people downloading over slow links).
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/etc/etc.amiga/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.amiga/Makefile.inc
diff -u src/etc/etc.amiga/Makefile.inc:1.29 src/etc/etc.amiga/Makefile.inc:1.30
--- src/etc/etc.amiga/Makefile.inc:1.29 Fri Mar 13 10:01:07 2020
+++ src/etc/etc.amiga/Makefile.inc Sat Mar 14 16:27:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.29 2020/03/13 10:01:07 is Exp $
+# $NetBSD: Makefile.inc,v 1.30 2020/03/14 16:27:19 is Exp $
#
# etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets
#
@@ -15,5 +15,7 @@ INSTALLATION_DIRS+= installation/miniroo
snap_md_post:
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*'
- ${TOOL_GZIP} -fd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/miniroot.fs.gz
+ rm ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/miniroot.fs
+ ${TOOL_GZIP} -cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/miniroot.fs.gz > \
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/miniroot.fs
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.fs*'
CVS commit: src/etc/etc.amiga
Module Name:src
Committed By: is
Date: Fri Mar 13 10:01:07 UTC 2020
Modified Files:
src/etc/etc.amiga: Makefile.inc
Log Message:
Provide the (small) miniroot uncompressed, so that it can be used from
an AmigaOS without additional software to install NetBSD.
Closes PR port-amiga/45443
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/etc/etc.amiga/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.amiga/Makefile.inc
diff -u src/etc/etc.amiga/Makefile.inc:1.28 src/etc/etc.amiga/Makefile.inc:1.29
--- src/etc/etc.amiga/Makefile.inc:1.28 Sun Sep 23 06:39:23 2018
+++ src/etc/etc.amiga/Makefile.inc Fri Mar 13 10:01:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2018/09/23 06:39:23 rin Exp $
+# $NetBSD: Makefile.inc,v 1.29 2020/03/13 10:01:07 is Exp $
#
# etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets
#
@@ -15,4 +15,5 @@ INSTALLATION_DIRS+= installation/miniroo
snap_md_post:
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*'
-# ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.gz'
+ ${TOOL_GZIP} -fd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/miniroot.fs.gz
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.fs*'
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: is Date: Sun Mar 8 17:54:23 UTC 2020 Modified Files: src/external/bsd/file/dist/magic/magdir: parix Log Message: mask was too loose, creating false positives. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/file/dist/magic/magdir/parix Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/parix diff -u src/external/bsd/file/dist/magic/magdir/parix:1.1.1.2 src/external/bsd/file/dist/magic/magdir/parix:1.2 --- src/external/bsd/file/dist/magic/magdir/parix:1.1.1.2 Thu May 12 20:47:04 2011 +++ src/external/bsd/file/dist/magic/magdir/parix Sun Mar 8 17:54:23 2020 @@ -5,7 +5,7 @@ # Parix COFF executables # From: Ignatios Souvatzis # -0 beshort&0xfff 0xACE PARIX +0 beshort&0xefff 0x8ACE PARIX >0 byte&0xf0 0x80 T800 >0 byte&0xf0 0x90 T9000 >19 byte&0x02 0x02 executable
CVS commit: src/sys/arch/amiga/conf
Module Name:src
Committed By: is
Date: Sat Mar 7 20:27:55 UTC 2020
Modified Files:
src/sys/arch/amiga/conf: WSCONS files.amiga
Log Message:
Whitespace police
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/amiga/conf/WSCONS
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/amiga/conf/files.amiga
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/WSCONS
diff -u src/sys/arch/amiga/conf/WSCONS:1.71 src/sys/arch/amiga/conf/WSCONS:1.72
--- src/sys/arch/amiga/conf/WSCONS:1.71 Fri Nov 4 18:06:08 2016
+++ src/sys/arch/amiga/conf/WSCONS Sat Mar 7 20:27:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: WSCONS,v 1.71 2016/11/04 18:06:08 phx Exp $
+# $NetBSD: WSCONS,v 1.72 2020/03/07 20:27:54 is Exp $
# GENERIC with wscons(4)
#
@@ -13,7 +13,7 @@ options FONT_VT220ISO8x16
wskbd0 at kbd0 console ?
-ukbd* at uhidev? reportid ?
+ukbd* at uhidev? reportid ?
wskbd* at ukbd? console ?
wsmouse* at ms?
@@ -43,8 +43,8 @@ no ite5 at grf5
no ite6 at grf6
no ite7 at grf7
-mntva* at zbus?# MNTMN VA2000
-#options MNTVA_CONSOLE
+mntva* at zbus? # MNTMN VA2000
+#options MNTVA_CONSOLE
# PCI framebuffers
#genfb* at pci? # CyberVisionPPC/BlizzardVisionPPC only
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.182 src/sys/arch/amiga/conf/files.amiga:1.183
--- src/sys/arch/amiga/conf/files.amiga:1.182 Wed May 8 13:40:13 2019
+++ src/sys/arch/amiga/conf/files.amiga Sat Mar 7 20:27:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.182 2019/05/08 13:40:13 isaki Exp $
+# $NetBSD: files.amiga,v 1.183 2020/03/07 20:27:54 is Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -20,7 +20,7 @@ defflag opt_amigacons.h RETINACONSOLE U
defflag opt_amigacons.h CV64CONSOLE CV3DCONSOLE TSENGCONSOLE
defflag opt_amigacons.h SERCONSOLE
-defflag opt_mntva.h MNTVA_CONSOLE
+defflag opt_mntva.h MNTVA_CONSOLE
defflag opt_kfont.h KFONT_CONS_ISO8859_1
defflag opt_kfont.h KFONT_CONS_ISO8859_2
@@ -34,7 +34,7 @@ defflagP5PPC68KBOARD
defflagLEV6_DEFER
defflagDEVRELOAD
-defflag opt_p5pb.h P5PB_DEBUG P5PB_CONSOLE
+defflag opt_p5pb.h P5PB_DEBUG P5PB_CONSOLE
defparam IOBZCLOCK
@@ -51,7 +51,7 @@ file arch/amiga/amiga/amiga_bus_simple_4
define amibus_ww
file arch/amiga/amiga/amiga_bus_simple_2word.c
-define amibus_wb
+define amibus_wb
file arch/amiga/amiga/amiga_bus_simple_1word.c
define amibus_b16
@@ -66,7 +66,7 @@ file arch/amiga/amiga/amiga_bus_simple_0
define amibus_b4000
file arch/amiga/amiga/amiga_bus_simple_0x4000.c amibus_b4000
-define amibus_empb
+define amibus_empb
file arch/amiga/pci/empb_bsm.c amibus_empb
file arch/amiga/amiga/bus.c
@@ -122,7 +122,7 @@ device repulse: audiobus, ac97
attach repulse at zbus
file arch/amiga/dev/repulse.c repulse
-device toccata: audiobus, ad1848
+device toccata: audiobus, ad1848
attach toccata at zbus
file arch/amiga/dev/toccata.c toccata
@@ -322,7 +322,7 @@ file arch/amiga/dev/gvpbus.c gvpbus
attach lpt at supio with lpt_supio
file arch/amiga/dev/lpt_supio.c lpt_supio
-include "dev/scsipi/files.scsipi"
+include "dev/scsipi/files.scsipi"
# wd 33c93 contrllers
define sbic
@@ -339,8 +339,8 @@ attach ahsc at mainbus
file arch/amiga/dev/ahsc.c ahsc needs-flag
# C= A2091
-device atzsc: scsi, sbic
-attach atzsc at zbus
+device atzsc: scsi, sbic
+attach atzsc at zbus
file arch/amiga/dev/atzsc.c atzsc needs-flag
# ncr 5380 controllers
@@ -480,9 +480,9 @@ file arch/amiga/dev/gayle_pcmcia.c pcca
device pccard: pcmciabus, gayle
attach pccard at mainbus
-include "dev/pcmcia/files.pcmcia"
+include "dev/pcmcia/files.pcmcia"
-include "dev/ata/files.ata"
+include "dev/ata/files.ata"
# Amiga 4000/1200 IDE using MI wdc
attach wdc at mainbus with wdc_amiga: gayle, amibus_b1000
@@ -493,32 +493,32 @@ attach wdc at zbus with wdc_buddha
file arch/amiga/dev/wdc_buddha.c wdc_buddha
# FastATA
-device efa: ata, wdc_common, amibus_b1000
-attach efa at mainbus
-filearch/amiga/dev/efa.c efa
+device efa: ata, wdc_common, amibus_b1000
+attach efa at mainbus
+file arch/amiga/dev/efa.c efa
# Compatibility modules
# NetBSD m68k a.out Binary Compatibility (COMPAT_AOUT_M68K)
-include "compat/aoutm68k/files.aoutm68k"
+include "compat/aoutm68k/files.aoutm68k"
# SunOS Binary Compatibility (COMPAT_SUNOS)
-include "compat/sunos/files.sunos"
+include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
# Linux binary compatibility (COMPAT_LINUX)
-include "compat/linux/files.linux"
-include "compat/linux/arch/m68k/files.linux_m68k"
-file arch/m68k/m68k/linux_trap.c compat_linux
+include "compat/linux/files.linux"
+include "compat/linux/arch/m68k/files.linux_m68k"
+file arch/m68k/m68k/linux_trap.c compat_linux
CVS commit: src/doc
Module Name:src Committed By: is Date: Mon Mar 2 20:04:42 UTC 2020 Modified Files: src/doc: CHANGES Log Message: Fix word accesses on Gayle (Amiga1200) pcmcia. Patch by Martin Åberg. To generate a diff of this commit: cvs rdiff -u -r1.2654 -r1.2655 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2654 src/doc/CHANGES:1.2655 --- src/doc/CHANGES:1.2654 Sat Feb 29 04:27:01 2020 +++ src/doc/CHANGES Mon Mar 2 20:04:42 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2654 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2655 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -148,3 +148,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: in the Raspberry Pi 4. [jmcneill 20200222] OpenSSH: Import 8.2. [christos 20200226] ld.elf_so(1): Implement DT_GNU_HASH [kamil 20200229] + amiga: Fix word accesses on Gayle (A1200) pcmcia. [is 20200302]
CVS commit: src/sys/arch/amiga/dev
Module Name:src Committed By: is Date: Mon Mar 2 19:48:23 UTC 2020 Modified Files: src/sys/arch/amiga/dev: gayle_pcmcia.c Log Message: The Gayle interface uses swapped (little-endian) word accesses, so we need to use the amiga_bus_stride_1swap methods for the word accesses. Analyzed and submitted via port-amiga@ by Martin Åberg. Tested on formerly working hardware - by Jukka Andberg with Dlink DE-660+ (ne) - by Frank Willewith D-Link DFE-670TXD (ne) Tested on formerly not working hardware: - by Martin with 3Com 3c589 Etherling III (ep) - by Martin and Frank with CompactFlash cards (wdc) To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amiga/dev/gayle_pcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/dev/gayle_pcmcia.c diff -u src/sys/arch/amiga/dev/gayle_pcmcia.c:1.31 src/sys/arch/amiga/dev/gayle_pcmcia.c:1.32 --- src/sys/arch/amiga/dev/gayle_pcmcia.c:1.31 Sun Feb 8 09:55:25 2015 +++ src/sys/arch/amiga/dev/gayle_pcmcia.c Mon Mar 2 19:48:23 2020 @@ -1,9 +1,9 @@ -/* $NetBSD: gayle_pcmcia.c,v 1.31 2015/02/08 09:55:25 jandberg Exp $ */ +/* $NetBSD: gayle_pcmcia.c,v 1.32 2020/03/02 19:48:23 is Exp $ */ /* public domain */ #include -__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.31 2015/02/08 09:55:25 jandberg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.32 2020/03/02 19:48:23 is Exp $"); /* PCMCIA front-end driver for A1200's and A600's. */ @@ -131,7 +131,7 @@ pccard_attach(device_t parent, device_t pmap_update(vm_map_pmap(kernel_map)); /* override the one-byte access methods for I/O space */ - pcmio_bs_methods = amiga_bus_stride_1; + pcmio_bs_methods = amiga_bus_stride_1swap; pcmio_bs_methods.bsr1 = pcmio_bsr1; pcmio_bs_methods.bsw1 = pcmio_bsw1; pcmio_bs_methods.bsrm1 = pcmio_bsrm1;
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: is Date: Sun Dec 30 15:43:43 UTC 2018 Modified Files: src/sys/arch/x86/pci: amdtemp.c Log Message: Document bobcat/puma family nicknames. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/pci/amdtemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/pci/amdtemp.c diff -u src/sys/arch/x86/pci/amdtemp.c:1.22 src/sys/arch/x86/pci/amdtemp.c:1.23 --- src/sys/arch/x86/pci/amdtemp.c:1.22 Wed Dec 12 23:35:04 2018 +++ src/sys/arch/x86/pci/amdtemp.c Sun Dec 30 15:43:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: amdtemp.c,v 1.22 2018/12/12 23:35:04 is Exp $ */ +/* $NetBSD: amdtemp.c,v 1.23 2018/12/30 15:43:43 is Exp $ */ /* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */ /* @@ -47,7 +47,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.22 2018/12/12 23:35:04 is Exp $ "); +__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.23 2018/12/30 15:43:43 is Exp $ "); #include #include @@ -250,8 +250,8 @@ amdtemp_attach(device_t parent, device_t case 0x11: /* AMD Griffin */ case 0x12: /* AMD Lynx/Sabine (Llano) */ case 0x14: /* AMD Brazos (Ontario/Zacate/Desna) */ - case 0x15: - case 0x16: + case 0x15: /* AMD Bobcat */ + case 0x16: /* AMD Puma/Jaguar */ amdtemp_family10_init(sc); break;
CVS commit: src/share/man/man4
Module Name:src Committed By: is Date: Sat Dec 29 20:29:46 UTC 2018 Modified Files: src/share/man/man4: amdtemp.4 Log Message: Document more supported CPU Famililies: Bobcat (for a while) and Puma (recently) To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/amdtemp.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/amdtemp.4 diff -u src/share/man/man4/amdtemp.4:1.11 src/share/man/man4/amdtemp.4:1.12 --- src/share/man/man4/amdtemp.4:1.11 Sat Jan 27 21:41:50 2018 +++ src/share/man/man4/amdtemp.4 Sat Dec 29 20:29:46 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: amdtemp.4,v 1.11 2018/01/27 21:41:50 pgoyette Exp $ +.\" $NetBSD: amdtemp.4,v 1.12 2018/12/29 20:29:46 is Exp $ .\"- .\" Copyright (c) 2008 Christoph Egger .\" All rights reserved. @@ -38,7 +38,8 @@ The .Nm driver provides support for the on-die digital thermal sensor present -on AMD K8, AMD Barcelona, AMD Phenom, AMD Griffin, and AMD Fusion CPUs. +on AMD K8, AMD Barcelona, AMD Phenom, AMD Griffin, AMD Fusion, +AMD Bobcat, and AMD Puma CPUs. .Pp These sensors were officially introduced in AMD K8 Revision F processors, and provide 0.5\(deC accuracy. @@ -47,7 +48,8 @@ which provide two more bits for 0.25\(de Each core has two temperature sensors, and there are up to two cores per CPU socket. .Pp -AMD Barcelona, AMD Phenom, AMD Griffin, and AMD Fusion provide 0.125\(deC +AMD Barcelona, AMD Phenom, AMD Griffin, AMD Fusion, +AMD Bobcat, and AMD Puma provide 0.125\(degC accuracy and provide one temperature sensor for each CPU socket. .Pp The
CVS commit: src/doc
Module Name:src Committed By: is Date: Wed Dec 12 23:40:02 UTC 2018 Modified Files: src/doc: CHANGES Log Message: amdtemp +16h To generate a diff of this commit: cvs rdiff -u -r1.2464 -r1.2465 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2464 src/doc/CHANGES:1.2465 --- src/doc/CHANGES:1.2464 Wed Dec 12 13:02:35 2018 +++ src/doc/CHANGES Wed Dec 12 23:40:02 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2464 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2465 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -262,3 +262,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0: kernel: Remove the lmc(4) driver, and its associated lmcconfig(8) tool. [maxv 20181212] sh(1): Many bug fixes and enhancements. [kre 20181212] + amdtemp(4): Add support for AMD family 16h temperature sensors. + [is 20181213]
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: is Date: Wed Dec 12 23:35:04 UTC 2018 Modified Files: src/sys/arch/x86/pci: amdnb_misc.c amdtemp.c Log Message: Added support for AMD family 16h cpu sensors - (just like 10h-14h). (Tested on netbsd-8.0 release.) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/pci/amdnb_misc.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/pci/amdtemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/pci/amdnb_misc.c diff -u src/sys/arch/x86/pci/amdnb_misc.c:1.2 src/sys/arch/x86/pci/amdnb_misc.c:1.3 --- src/sys/arch/x86/pci/amdnb_misc.c:1.2 Mon Apr 16 16:07:24 2012 +++ src/sys/arch/x86/pci/amdnb_misc.c Wed Dec 12 23:35:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: amdnb_misc.c,v 1.2 2012/04/16 16:07:24 cegger Exp $ */ +/* $NetBSD: amdnb_misc.c,v 1.3 2018/12/12 23:35:04 is Exp $ */ /* * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: amdnb_misc.c,v 1.2 2012/04/16 16:07:24 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amdnb_misc.c,v 1.3 2018/12/12 23:35:04 is Exp $"); #include #include @@ -67,6 +67,8 @@ amdnb_misc_match(device_t parent, cfdata case PCI_PRODUCT_AMD_AMD64_F11_MISC: case PCI_PRODUCT_AMD_F14_NB: /* Family 12h, too */ case PCI_PRODUCT_AMD_F15_MISC: + case PCI_PRODUCT_AMD_F16_NB: + case PCI_PRODUCT_AMD_F16_30_NB: break; default: return 0; Index: src/sys/arch/x86/pci/amdtemp.c diff -u src/sys/arch/x86/pci/amdtemp.c:1.21 src/sys/arch/x86/pci/amdtemp.c:1.22 --- src/sys/arch/x86/pci/amdtemp.c:1.21 Thu Sep 27 14:59:43 2018 +++ src/sys/arch/x86/pci/amdtemp.c Wed Dec 12 23:35:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: amdtemp.c,v 1.21 2018/09/27 14:59:43 maxv Exp $ */ +/* $NetBSD: amdtemp.c,v 1.22 2018/12/12 23:35:04 is Exp $ */ /* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */ /* @@ -47,7 +47,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.21 2018/09/27 14:59:43 maxv Exp $ "); +__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.22 2018/12/12 23:35:04 is Exp $ "); #include #include @@ -206,7 +206,7 @@ amdtemp_match(device_t parent, cfdata_t } /* Not yet supported CPUs. */ - if (family > 0x15) + if (family > 0x16) return 0; return 1; @@ -251,6 +251,7 @@ amdtemp_attach(device_t parent, device_t case 0x12: /* AMD Lynx/Sabine (Llano) */ case 0x14: /* AMD Brazos (Ontario/Zacate/Desna) */ case 0x15: + case 0x16: amdtemp_family10_init(sc); break; @@ -278,6 +279,7 @@ amdtemp_attach(device_t parent, device_t case 0x12: case 0x14: case 0x15: + case 0x16: amdtemp_family10_setup_sensors(sc, device_unit(self)); break; } @@ -305,6 +307,7 @@ amdtemp_attach(device_t parent, device_t case 0x12: case 0x14: case 0x15: + case 0x16: sc->sc_sme->sme_refresh = amdtemp_family10_refresh; break; }
CVS commit: src/etc
Module Name:src
Committed By: is
Date: Fri Dec 29 18:15:49 UTC 2017
Modified Files:
src/etc/defaults: rc.conf
src/etc/mtree: special
Added Files:
src/etc/rc.d: dhcpd6
Log Message:
Add startup file for dhcp v6 with builtin isc-dhcp. Alas, this needs to
be a seperate process. On the positive side: this can't break the dhcpd
for IPv4 when tested.
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/etc/defaults/rc.conf
cvs rdiff -u -r1.160 -r1.161 src/etc/mtree/special
cvs rdiff -u -r0 -r1.1 src/etc/rc.d/dhcpd6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.139 src/etc/defaults/rc.conf:1.140
--- src/etc/defaults/rc.conf:1.139 Sat Jan 7 20:00:33 2017
+++ src/etc/defaults/rc.conf Fri Dec 29 18:15:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.139 2017/01/07 20:00:33 christos Exp $
+# $NetBSD: rc.conf,v 1.140 2017/12/29 18:15:48 is Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -269,6 +269,7 @@ ldpd=NO
rarpd=NO rarpd_flags="-a"
bootparamd=NO bootparamd_flags=""
dhcpd=NO dhcpd_flags="-q"
+dhcpd6=NO dhcpd6_flags="-q -cf /etc/dhcpd6.conf"
dhcrelay=NO dhcrelay_flags=""
rbootd=NO rbootd_flags=""
mopd=NO mopd_flags="-a"
Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.160 src/etc/mtree/special:1.161
--- src/etc/mtree/special:1.160 Mon Feb 20 13:45:43 2017
+++ src/etc/mtree/special Fri Dec 29 18:15:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: special,v 1.160 2017/02/20 13:45:43 christos Exp $
+# $NetBSD: special,v 1.161 2017/12/29 18:15:49 is Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@@ -62,6 +62,7 @@
./etc/dhcpcd.duid type=file mode=0644 optional
./etc/dhcpcd.hook type=file mode=0644 optional
./etc/dhcpd.conf type=file mode=0644 optional
+./etc/dhcpd6.conf type=file mode=0644 optional
./etc/disktab type=file mode=0644
./etc/dm.conf type=file mode=0644
./etc/dumpdates type=file mode=0664 gname=operator optional tags=exclude
@@ -202,6 +203,7 @@
./etc/rc.d/dhclient type=file mode=0555
./etc/rc.d/dhcpcd type=file mode=0555
./etc/rc.d/dhcpd type=file mode=0555
+./etc/rc.d/dhcpd6 type=file mode=0555
./etc/rc.d/dhcrelay type=file mode=0555
./etc/rc.d/dmesg type=file mode=0555
./etc/rc.d/downinterfaces type=file mode=0555
Added files:
Index: src/etc/rc.d/dhcpd6
diff -u /dev/null src/etc/rc.d/dhcpd6:1.1
--- /dev/null Fri Dec 29 18:15:49 2017
+++ src/etc/rc.d/dhcpd6 Fri Dec 29 18:15:49 2017
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $NetBSD: dhcpd6,v 1.1 2017/12/29 18:15:49 is Exp $
+#
+
+# PROVIDE: dhcpd6
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="dhcpd6"
+rcvar=$name
+command="/usr/sbin/dhcpd"
+start_precmd="dhcpd6_precmd"
+pidfile="/var/run/${name}.pid"
+required_files="/etc/${name}.conf"
+
+dhcpd6_precmd()
+{
+if [ ! -e "/var/db/${name}.leases" ]; then
+echo "Creating /var/db/${name}.leases"
+touch /var/db/${name}.leases
+fi
+}
+
+load_rc_config $name
+dhcpd6_flags="-6 $dhcpd6_flags"
+run_rc_command "$1"
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: is
Date: Mon Jun 26 20:36:01 UTC 2017
Modified Files:
src/sys/dev/usb: moscom.c
Log Message:
Add first channel of mcs7720.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/moscom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/moscom.c
diff -u src/sys/dev/usb/moscom.c:1.10 src/sys/dev/usb/moscom.c:1.11
--- src/sys/dev/usb/moscom.c:1.10 Thu Jul 7 06:55:42 2016
+++ src/sys/dev/usb/moscom.c Mon Jun 26 20:36:01 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: moscom.c,v 1.10 2016/07/07 06:55:42 msaitoh Exp $ */
+/* $NetBSD: moscom.c,v 1.11 2017/06/26 20:36:01 is Exp $ */
/* $OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.10 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.11 2017/06/26 20:36:01 is Exp $");
#include
#include
@@ -168,6 +168,7 @@ struct ucom_methods moscom_methods = {
static const struct usb_devno moscom_devs[] = {
{ USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7703 },
+ { USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7720 },
{ USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7840 },
{ USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC2324 }
};
CVS commit: src/sys/dev/usb
Module Name:src Committed By: is Date: Mon Jun 26 20:28:43 UTC 2017 Modified Files: src/sys/dev/usb: usbdevs Log Message: yet another moschip serial adapter chip. To generate a diff of this commit: cvs rdiff -u -r1.736 -r1.737 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.736 src/sys/dev/usb/usbdevs:1.737 --- src/sys/dev/usb/usbdevs:1.736 Tue May 30 20:13:35 2017 +++ src/sys/dev/usb/usbdevs Mon Jun 26 20:28:42 2017 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.736 2017/05/30 20:13:35 jnemeth Exp $ +$NetBSD: usbdevs,v 1.737 2017/06/26 20:28:42 is Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2297,6 +2297,7 @@ product MOBILITY EASIDOCK 0x0304 EasiDoc /* MosChip Semiconductor */ product MOSCHIP MCS7703 0x7703 MCS7703 USB Serial Adapter +product MOSCHIP MCS7720 0x7720 MCS7720 USB Serial Adapter product MOSCHIP MCS7780 0x7780 MCS7780 Fast IrDA Adapter product MOSCHIP MCS7781 0x7781 MCS7781 Fast IrDA Adapter product MOSCHIP MCS7784 0x7784 MCS7784 Slow IrDA Adapter
CVS commit: src/sys/netinet
Module Name:src
Committed By: is
Date: Sat Jul 23 13:37:11 UTC 2016
Modified Files:
src/sys/netinet: ip_carp.c
Log Message:
Print the IPv6 or IPv4 source addresses of packets with wrong hash, to
help debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/netinet/ip_carp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.75 src/sys/netinet/ip_carp.c:1.76
--- src/sys/netinet/ip_carp.c:1.75 Sat Jul 23 12:19:07 2016
+++ src/sys/netinet/ip_carp.c Sat Jul 23 13:37:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.75 2016/07/23 12:19:07 is Exp $ */
+/* $NetBSD: ip_carp.c,v 1.76 2016/07/23 13:37:10 is Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.75 2016/07/23 12:19:07 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.76 2016/07/23 13:37:10 is Exp $");
/*
* TODO:
@@ -94,6 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v
#include
#include
#include
+#include
#endif
#include
@@ -682,9 +683,29 @@ carp_proto_input_c(struct mbuf *m, struc
/* verify the hash */
if (carp_hmac_verify(sc, ch->carp_counter, ch->carp_md)) {
+ struct ip *ip;
+ struct ip6_hdr *ip6;
+
CARP_STATINC(CARP_STAT_BADAUTH);
sc->sc_if.if_ierrors++;
- CARP_LOG(sc, ("incorrect hash"));
+
+ switch(af) {
+
+ case AF_INET:
+ ip = mtod(m, struct ip *);
+ CARP_LOG(sc, ("incorrect hash from %s",
+ in_fmtaddr(ip->ip_src)));
+ break;
+
+ case AF_INET6:
+ ip6 = mtod(m, struct ip6_hdr *);
+ CARP_LOG(sc, ("incorrect hash from %s",
+ip6_sprintf(>ip6_src)));
+ break;
+
+ default: CARP_LOG(sc, ("incorrect hash"));
+ break;
+ }
m_freem(m);
return;
}
CVS commit: [netbsd-7] src/sys/netinet
Module Name:src
Committed By: is
Date: Sat Jul 23 13:33:32 UTC 2016
Modified Files:
src/sys/netinet [netbsd-7]: ip_carp.c
Log Message:
backout last change (wrong branch).
To generate a diff of this commit:
cvs rdiff -u -r1.59.2.1 -r1.59.2.2 src/sys/netinet/ip_carp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.59.2.1 src/sys/netinet/ip_carp.c:1.59.2.2
--- src/sys/netinet/ip_carp.c:1.59.2.1 Sat Jul 23 13:24:40 2016
+++ src/sys/netinet/ip_carp.c Sat Jul 23 13:33:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.59.2.1 2016/07/23 13:24:40 is Exp $ */
+/* $NetBSD: ip_carp.c,v 1.59.2.2 2016/07/23 13:33:32 is Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -31,7 +31,7 @@
#include "opt_mbuftrace.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.1 2016/07/23 13:24:40 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.2 2016/07/23 13:33:32 is Exp $");
/*
* TODO:
@@ -92,7 +92,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v
#include
#include
#include
-#include
#endif
#include
@@ -676,29 +675,9 @@ carp_proto_input_c(struct mbuf *m, struc
/* verify the hash */
if (carp_hmac_verify(sc, ch->carp_counter, ch->carp_md)) {
- struct ip *ip;
- struct ip6_hdr *ip6;
-
CARP_STATINC(CARP_STAT_BADAUTH);
sc->sc_if.if_ierrors++;
-
- switch(af) {
-
- case AF_INET:
- ip = mtod(m, struct ip *);
- CARP_LOG(sc, ("incorrect hash from %s",
- in_fmtaddr(ip->ip_src)));
- break;
-
- case AF_INET6:
- ip6 = mtod(m, struct ip6_hdr *);
- CARP_LOG(sc, ("incorrect hash from %s",
-ip6_sprintf(>ip6_src)));
- break;
-
- default: CARP_LOG(sc, ("incorrect hash"));
- break;
- }
+ CARP_LOG(sc, ("incorrect hash"));
m_freem(m);
return;
}
CVS commit: [netbsd-7] src/sys/netinet
Module Name:src
Committed By: is
Date: Sat Jul 23 13:24:40 UTC 2016
Modified Files:
src/sys/netinet [netbsd-7]: ip_carp.c
Log Message:
Log the IPv4/IPv6 source of incorrect hash packets, too. Needed for
meaningful debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.2.1 src/sys/netinet/ip_carp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.59 src/sys/netinet/ip_carp.c:1.59.2.1
--- src/sys/netinet/ip_carp.c:1.59 Thu Jul 31 02:37:25 2014
+++ src/sys/netinet/ip_carp.c Sat Jul 23 13:24:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.59 2014/07/31 02:37:25 ozaki-r Exp $ */
+/* $NetBSD: ip_carp.c,v 1.59.2.1 2016/07/23 13:24:40 is Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -31,7 +31,7 @@
#include "opt_mbuftrace.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59 2014/07/31 02:37:25 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.1 2016/07/23 13:24:40 is Exp $");
/*
* TODO:
@@ -92,6 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v
#include
#include
#include
+#include
#endif
#include
@@ -675,9 +676,29 @@ carp_proto_input_c(struct mbuf *m, struc
/* verify the hash */
if (carp_hmac_verify(sc, ch->carp_counter, ch->carp_md)) {
+ struct ip *ip;
+ struct ip6_hdr *ip6;
+
CARP_STATINC(CARP_STAT_BADAUTH);
sc->sc_if.if_ierrors++;
- CARP_LOG(sc, ("incorrect hash"));
+
+ switch(af) {
+
+ case AF_INET:
+ ip = mtod(m, struct ip *);
+ CARP_LOG(sc, ("incorrect hash from %s",
+ in_fmtaddr(ip->ip_src)));
+ break;
+
+ case AF_INET6:
+ ip6 = mtod(m, struct ip6_hdr *);
+ CARP_LOG(sc, ("incorrect hash from %s",
+ip6_sprintf(>ip6_src)));
+ break;
+
+ default: CARP_LOG(sc, ("incorrect hash"));
+ break;
+ }
m_freem(m);
return;
}
CVS commit: src/sys/netinet
Module Name:src
Committed By: is
Date: Sat Jul 23 12:19:08 UTC 2016
Modified Files:
src/sys/netinet: ip_carp.c
Log Message:
Workaround for PR 47013 by bouyer@. Only works for mixed IPv4/IPv6
environemnts, not for pure-IPv6 yet. A real fix is still needed.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/netinet/ip_carp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.74 src/sys/netinet/ip_carp.c:1.75
--- src/sys/netinet/ip_carp.c:1.74 Thu Jul 7 09:32:02 2016
+++ src/sys/netinet/ip_carp.c Sat Jul 23 12:19:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.74 2016/07/07 09:32:02 ozaki-r Exp $ */
+/* $NetBSD: ip_carp.c,v 1.75 2016/07/23 12:19:07 is Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.74 2016/07/07 09:32:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.75 2016/07/23 12:19:07 is Exp $");
/*
* TODO:
@@ -1086,7 +1086,7 @@ carp_send_ad(void *v)
}
}
#endif /* INET */
-#ifdef INET6
+#ifdef INET6_notyet
if (sc->sc_naddrs6) {
struct ip6_hdr *ip6;
@@ -1494,7 +1494,7 @@ carp_setrun(struct carp_softc *sc, sa_fa
callout_schedule(>sc_md_tmo, tvtohz());
break;
#endif /* INET */
-#ifdef INET6
+#ifdef INET6_notyet
case AF_INET6:
callout_schedule(>sc_md6_tmo, tvtohz());
break;
@@ -1502,8 +1502,10 @@ carp_setrun(struct carp_softc *sc, sa_fa
default:
if (sc->sc_naddrs)
callout_schedule(>sc_md_tmo, tvtohz());
+#ifdef INET6_notyet
if (sc->sc_naddrs6)
callout_schedule(>sc_md6_tmo, tvtohz());
+#endif /* INET6 */
break;
}
break;
CVS commit: src/sys/netinet6
Module Name:src
Committed By: is
Date: Fri Apr 29 11:46:17 UTC 2016
Modified Files:
src/sys/netinet6: nd6_nbr.c
Log Message:
Let non-neighbor NS/NA debug error message include useful information.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/netinet6/nd6_nbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.116 src/sys/netinet6/nd6_nbr.c:1.117
--- src/sys/netinet6/nd6_nbr.c:1.116 Mon Apr 11 01:16:20 2016
+++ src/sys/netinet6/nd6_nbr.c Fri Apr 29 11:46:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.116 2016/04/11 01:16:20 ozaki-r Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.117 2016/04/29 11:46:17 is Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.116 2016/04/11 01:16:20 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.117 2016/04/29 11:46:17 is Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -149,7 +149,9 @@ nd6_ns_input(struct mbuf *m, int off, in
*/
sockaddr_in6_init(, , 0, 0, 0);
if (nd6_is_addr_neighbor(, ifp) == 0) {
- nd6log(LOG_INFO, "NS packet from non-neighbor\n");
+ nd6log(LOG_INFO,
+ "NS packet from non-neighbor %s on %s\n",
+ ip6_sprintf(), if_name(ifp));
goto bad;
}
}
@@ -625,7 +627,8 @@ nd6_na_input(struct mbuf *m, int off, in
*/
sockaddr_in6_init(, , 0, 0, 0);
if (nd6_is_addr_neighbor(, ifp) == 0) {
- nd6log(LOG_INFO, "ND packet from non-neighbor\n");
+ nd6log(LOG_INFO, "ND packet from non-neighbor %s on %s\n",
+ ip6_sprintf(), if_name(ifp));
goto bad;
}
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: is
Date: Sun Jan 11 19:54:23 UTC 2015
Modified Files:
src/sys/arch/x86/x86: consinit.c
Log Message:
Add support for the (cobalt) nullcons to amd64 and i386.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/x86/consinit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/consinit.c
diff -u src/sys/arch/x86/x86/consinit.c:1.27 src/sys/arch/x86/x86/consinit.c:1.28
--- src/sys/arch/x86/x86/consinit.c:1.27 Wed Mar 12 12:54:33 2014
+++ src/sys/arch/x86/x86/consinit.c Sun Jan 11 19:54:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.27 2014/03/12 12:54:33 martin Exp $ */
+/* $NetBSD: consinit.c,v 1.28 2015/01/11 19:54:23 is Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.27 2014/03/12 12:54:33 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.28 2015/01/11 19:54:23 is Exp $);
#include opt_kgdb.h
#include opt_puc.h
@@ -39,6 +39,9 @@ __KERNEL_RCSID(0, $NetBSD: consinit.c,v
#include machine/bootinfo.h
#include arch/x86/include/genfb_machdep.h
+#include dev/cons.h
+
+#include nullcons.h
#include genfb.h
#include vga.h
#include ega.h
@@ -235,6 +238,14 @@ dokbd:
return;
}
#endif
+#if (NNULLCONS 0)
+ if (!strcmp(consinfo-devname, nullcons)) {
+ void nullcninit(struct consdev *cn);
+
+ nullcninit(0);
+ return;
+ }
+#endif
panic(invalid console device %s, consinfo-devname);
}
CVS commit: src/sbin/mbrlabel
Module Name:src Committed By: is Date: Wed Feb 27 20:43:00 UTC 2013 Modified Files: src/sbin/mbrlabel: mbrlabel.8 Log Message: Fix terminology issue brought up by Bug Hunting in PR 47314. The boot records in extended partitions are called Extended Boot Record (EBR); use that in the documentation where appropriate. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sbin/mbrlabel/mbrlabel.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mbrlabel/mbrlabel.8 diff -u src/sbin/mbrlabel/mbrlabel.8:1.18 src/sbin/mbrlabel/mbrlabel.8:1.19 --- src/sbin/mbrlabel/mbrlabel.8:1.18 Sat Jul 14 20:13:30 2012 +++ src/sbin/mbrlabel/mbrlabel.8 Wed Feb 27 20:43:00 2013 @@ -27,9 +27,9 @@ .\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.\ $NetBSD: mbrlabel.8,v 1.18 2012/07/14 20:13:30 wiz Exp $ +.\ $NetBSD: mbrlabel.8,v 1.19 2013/02/27 20:43:00 is Exp $ .\ -.Dd July 13, 2012 +.Dd February 27, 2013 .Dt MBRLABEL 8 .Os .Sh NAME @@ -44,7 +44,8 @@ .Nm is used to update a .Nx -disk label from the Master Boot Record (MBR) label(s) found +disk label from the Master Boot Record (MBR) label and Extended +Boot Record (EBR) label(s) found on disks that were previously used on DOS/Windows systems (or other MBR using systems). .Pp @@ -53,11 +54,11 @@ scans the MBR contained in the very firs block specified through the .Fl s flag), then walks through every extended partition found and generates -additional partition entries for the disk from the MBRs found in +additional partition entries for the disk from the EBRs found in those extended partitions. .Pp -Each MBR partition which does not have an equivalent partition in the -disk label (equivalent in having the same size and offset) is added to +Each MBR and each EBR partition which does not have an equivalent partition +in the disk label (equivalent in having the same size and offset) is added to the first free partition slot in the disk label. A free partition slot is defined as one with an .Dv fstype @@ -105,6 +106,11 @@ See also .Xr dkctl 8 , .Xr fdisk 8 , .Xr mbr 8 +.Rs +.%A Tn Microsoft corporation +.%T Disk Concepts and Troubleshooting +.%R Tn Microsoft technical library +.Re .Sh HISTORY The .Nm
CVS commit: src/doc
Module Name:src Committed By: is Date: Fri Aug 31 20:23:33 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: Note OpenSSH 6.1. Thanks for heads-up to Snader_LB. To generate a diff of this commit: cvs rdiff -u -r1.964 -r1.965 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.964 src/doc/3RDPARTY:1.965 --- src/doc/3RDPARTY:1.964 Tue Aug 28 07:55:01 2012 +++ src/doc/3RDPARTY Fri Aug 31 20:23:33 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.964 2012/08/28 07:55:01 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.965 2012/08/31 20:23:33 is Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -848,7 +848,7 @@ Patch applied after OpenSSH import. Package: OpenSSH Version: 6.0 -Current Vers: 6.0 / portable 6.0p1 +Current Vers: 6.1 / portable 6.1p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: is
Date: Wed Jul 4 06:09:38 UTC 2012
Modified Files:
src/usr.bin/ftp: extern.h fetch.c ftp.c util.c
Log Message:
As discussed on tech-net@: Don't display expected EHOSTUNREACH for all but
the last connect attempts in terse mode.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/usr.bin/ftp/extern.h
cvs rdiff -u -r1.197 -r1.198 src/usr.bin/ftp/fetch.c
cvs rdiff -u -r1.163 -r1.164 src/usr.bin/ftp/ftp.c
cvs rdiff -u -r1.156 -r1.157 src/usr.bin/ftp/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/extern.h
diff -u src/usr.bin/ftp/extern.h:1.79 src/usr.bin/ftp/extern.h:1.80
--- src/usr.bin/ftp/extern.h:1.79 Fri Sep 16 15:39:26 2011
+++ src/usr.bin/ftp/extern.h Wed Jul 4 06:09:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.79 2011/09/16 15:39:26 joerg Exp $ */
+/* $NetBSD: extern.h,v 1.80 2012/07/04 06:09:37 is Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -239,7 +239,7 @@ void unsetoption(int, char **);
void updatelocalcwd(void);
void updateremotecwd(void);
void user(int, char **);
-int ftp_connect(int, const struct sockaddr *, socklen_t);
+int ftp_connect(int, const struct sockaddr *, socklen_t, int);
int ftp_listen(int, int);
int ftp_poll(struct pollfd *, int, int);
void *ftp_malloc(size_t);
Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.197 src/usr.bin/ftp/fetch.c:1.198
--- src/usr.bin/ftp/fetch.c:1.197 Fri Feb 24 19:53:31 2012
+++ src/usr.bin/ftp/fetch.c Wed Jul 4 06:09:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.197 2012/02/24 19:53:31 apb Exp $ */
+/* $NetBSD: fetch.c,v 1.198 2012/07/04 06:09:37 is Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fetch.c,v 1.197 2012/02/24 19:53:31 apb Exp $);
+__RCSID($NetBSD: fetch.c,v 1.198 2012/07/04 06:09:37 is Exp $);
#endif /* not lint */
/*
@@ -734,7 +734,8 @@ fetch_url(const char *url, const char *p
continue;
}
- if (ftp_connect(s, res-ai_addr, res-ai_addrlen) 0) {
+ if (ftp_connect(s, res-ai_addr, res-ai_addrlen,
+ verbose || !res-ai_next) 0) {
close(s);
s = -1;
continue;
Index: src/usr.bin/ftp/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.163 src/usr.bin/ftp/ftp.c:1.164
--- src/usr.bin/ftp/ftp.c:1.163 Sat Dec 10 05:53:58 2011
+++ src/usr.bin/ftp/ftp.c Wed Jul 4 06:09:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.163 2011/12/10 05:53:58 lukem Exp $ */
+/* $NetBSD: ftp.c,v 1.164 2012/07/04 06:09:37 is Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
#if 0
static char sccsid[] = @(#)ftp.c 8.6 (Berkeley) 10/27/94;
#else
-__RCSID($NetBSD: ftp.c,v 1.163 2011/12/10 05:53:58 lukem Exp $);
+__RCSID($NetBSD: ftp.c,v 1.164 2012/07/04 06:09:37 is Exp $);
#endif
#endif /* not lint */
@@ -208,7 +208,8 @@ hookup(const char *host, const char *por
hname, sname);
continue;
}
- if (ftp_connect(s, res-ai_addr, res-ai_addrlen) 0) {
+ if (ftp_connect(s, res-ai_addr, res-ai_addrlen,
+ verbose || !res-ai_next) 0) {
close(s);
s = -1;
continue;
@@ -1468,7 +1469,7 @@ initconn(void)
goto bad;
if (ftp_connect(data, (struct sockaddr *)data_addr.si_su,
- data_addr.su_len) 0) {
+ data_addr.su_len, 1) 0) {
if (activefallback) {
(void)close(data);
data = -1;
Index: src/usr.bin/ftp/util.c
diff -u src/usr.bin/ftp/util.c:1.156 src/usr.bin/ftp/util.c:1.157
--- src/usr.bin/ftp/util.c:1.156 Sat Dec 10 05:53:58 2011
+++ src/usr.bin/ftp/util.c Wed Jul 4 06:09:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.156 2011/12/10 05:53:58 lukem Exp $ */
+/* $NetBSD: util.c,v 1.157 2012/07/04 06:09:37 is Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: util.c,v 1.156 2011/12/10 05:53:58 lukem Exp $);
+__RCSID($NetBSD: util.c,v 1.157 2012/07/04 06:09:37 is Exp $);
#endif /* not lint */
/*
@@ -1351,7 +1351,7 @@ get_line(FILE *stream, char *buf, size_t
* error message displayed.)
*/
int
-ftp_connect(int sock, const struct sockaddr *name, socklen_t namelen)
+ftp_connect(int sock, const struct sockaddr *name, socklen_t namelen, int pe)
{
int flags, rv, timeout, error;
socklen_t slen;
@@ -1417,8 +1417,9 @@ ftp_connect(int sock, const struct socka
rv = connect(sock, name, namelen); /* inititate the connection */
if (rv == -1) {/* connection error */
if (errno != EINPROGRESS) { /* error isn't please wait */
+ if (pe || (errno != EHOSTUNREACH))
connecterror:
- warn(Can't connect to `%s:%s', hname, sname);
+warn(Can't connect to `%s:%s', hname, sname);
return -1;
}
CVS commit: xsrc/xfree/xc/programs/Xserver
Module Name:xsrc Committed By: is Date: Fri Dec 30 16:48:04 UTC 2011 Modified Files: xsrc/xfree/xc/programs/Xserver/fb: fbpict.c xsrc/xfree/xc/programs/Xserver/mi: miarc.c misprite.c Log Message: This fix is taken from xorg-server 1.9.2. mod(a,b) used to be defined with a - in front of naked a, such that uses of mod with certain arithmetic expressions as a led to surprising results, namely the one in Xrender praised in CVE-2010-1166. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/xfree/xc/programs/Xserver/fb/fbpict.c cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/xfree/xc/programs/Xserver/mi/miarc.c \ xsrc/xfree/xc/programs/Xserver/mi/misprite.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/programs/Xserver/fb/fbpict.c diff -u xsrc/xfree/xc/programs/Xserver/fb/fbpict.c:1.4 xsrc/xfree/xc/programs/Xserver/fb/fbpict.c:1.5 --- xsrc/xfree/xc/programs/Xserver/fb/fbpict.c:1.4 Sat Apr 19 19:00:39 2008 +++ xsrc/xfree/xc/programs/Xserver/fb/fbpict.c Fri Dec 30 16:48:04 2011 @@ -908,7 +908,7 @@ fbCompositeSolidMask_nx1xn (CARD8 o 0x0); } -# define mod(a,b) ((b) == 1 ? 0 : (a) = 0 ? (a) % (b) : (b) - (-a) % (b)) +# define mod(a,b) ((b) == 1 ? 0 : (a) = 0 ? (a) % (b) : (b) - (-(a)) % (b)) void fbComposite (CARD8 op, Index: xsrc/xfree/xc/programs/Xserver/mi/miarc.c diff -u xsrc/xfree/xc/programs/Xserver/mi/miarc.c:1.1.1.5 xsrc/xfree/xc/programs/Xserver/mi/miarc.c:1.2 --- xsrc/xfree/xc/programs/Xserver/mi/miarc.c:1.1.1.5 Fri Mar 5 14:29:39 2004 +++ xsrc/xfree/xc/programs/Xserver/mi/miarc.c Fri Dec 30 16:48:04 2011 @@ -1554,7 +1554,7 @@ miRoundCap( # define Dsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0))) # define Dcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0))) -# define mod(a,b) ((a) = 0 ? (a) % (b) : (b) - (-a) % (b)) +# define mod(a,b) ((a) = 0 ? (a) % (b) : (b) - (-(a)) % (b)) static double miDcos (double a) Index: xsrc/xfree/xc/programs/Xserver/mi/misprite.c diff -u xsrc/xfree/xc/programs/Xserver/mi/misprite.c:1.1.1.5 xsrc/xfree/xc/programs/Xserver/mi/misprite.c:1.2 --- xsrc/xfree/xc/programs/Xserver/mi/misprite.c:1.1.1.5 Fri Feb 28 13:20:27 2003 +++ xsrc/xfree/xc/programs/Xserver/mi/misprite.c Fri Dec 30 16:48:04 2011 @@ -1978,7 +1978,7 @@ miSpriteLineHelper() #ifdef RENDER -# define mod(a,b) ((b) == 1 ? 0 : (a) = 0 ? (a) % (b) : (b) - (-a) % (b)) +# define mod(a,b) ((b) == 1 ? 0 : (a) = 0 ? (a) % (b) : (b) - (-(a)) % (b)) static void miSpritePictureOverlap (PicturePtr pPict,
CVS commit: src/usr.sbin/lpr/lpd
Module Name:src
Committed By: is
Date: Wed Nov 9 12:45:58 UTC 2011
Modified Files:
src/usr.sbin/lpr/lpd: lpd.8 lpd.c
Log Message:
If hosts.lpd contains '+', don't insist on reverse DNS == forward DNS.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/lpr/lpd/lpd.8
cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/lpr/lpd/lpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/lpr/lpd/lpd.8
diff -u src/usr.sbin/lpr/lpd/lpd.8:1.33 src/usr.sbin/lpr/lpd/lpd.8:1.34
--- src/usr.sbin/lpr/lpd/lpd.8:1.33 Sun Jan 22 21:31:17 2006
+++ src/usr.sbin/lpr/lpd/lpd.8 Wed Nov 9 12:45:58 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: lpd.8,v 1.33 2006/01/22 21:31:17 wiz Exp $
+.\ $NetBSD: lpd.8,v 1.34 2011/11/09 12:45:58 is Exp $
.\
.\ Copyright (c) 1983, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -176,7 +176,11 @@ Second, all requests must come from one
the file
.Pa /etc/hosts.equiv
or
-.Pa /etc/hosts.lpd .
+.Pa /etc/hosts.lpd
+unless there is a line consisting of '+', in which case any host
+will be accepted that passes the
+.Xr hosts_access 5
+test and has reverse resolving set up.
Lastly, if the
.Li rs
capability is specified in the
Index: src/usr.sbin/lpr/lpd/lpd.c
diff -u src/usr.sbin/lpr/lpd/lpd.c:1.56 src/usr.sbin/lpr/lpd/lpd.c:1.57
--- src/usr.sbin/lpr/lpd/lpd.c:1.56 Tue Aug 30 19:27:37 2011
+++ src/usr.sbin/lpr/lpd/lpd.c Wed Nov 9 12:45:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpd.c,v 1.56 2011/08/30 19:27:37 joerg Exp $ */
+/* $NetBSD: lpd.c,v 1.57 2011/11/09 12:45:58 is Exp $ */
/*
* Copyright (c) 1983, 1993, 1994
@@ -41,7 +41,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)lpd.c 8.7 (Berkeley) 5/10/95;
#else
-__RCSID($NetBSD: lpd.c,v 1.56 2011/08/30 19:27:37 joerg Exp $);
+__RCSID($NetBSD: lpd.c,v 1.57 2011/11/09 12:45:58 is Exp $);
#endif
#endif /* not lint */
@@ -133,6 +133,7 @@ static void startup(void);
static void chkhost(struct sockaddr *, int);
__dead static void usage(void);
static struct pollfd *socksetup(int, int, const char *, int *);
+static void chkplushost(int, FILE *, char*);
uid_t uid, euid;
int child_count;
@@ -362,6 +363,35 @@ main(int argc, char **argv)
}
}
+/*
+ * If there was a forward/backward name resolution mismatch, check
+ * that there's a '+' entry in fhost.
+ */
+
+void
+chkplushost(int good, FILE *fhost, char *hst)
+{
+ int c1, c2, c3;
+
+ if (good) {
+ return;
+ }
+
+ rewind(fhost);
+ while (EOF != (c1 = fgetc(fhost))) {
+ if (c1 == '+') {
+ c2 = fgetc(fhost);
+ if (c2 == ' ' || c2 == '\t' || c2 == '\n') {
+return;
+ }
+ }
+ do {
+ c3 = fgetc(fhost);
+ } while (c3 != EOF c3 != '\n');
+ }
+ fatal(address for your hostname (%s) not matched, hst);
+}
+
static void
reapchild(int signo)
{
@@ -606,25 +636,23 @@ chkhost(struct sockaddr *f, int check_op
fatal(Cannot print address);
/* Check for spoof, ala rlogind */
+ good = 0;
memset(hints, 0, sizeof(hints));
hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM; /*dummy*/
error = getaddrinfo(fromb, NULL, hints, res);
- if (error) {
- fatal(hostname for your address (%s) unknown: %s, hst,
- gai_strerror(error));
+ if (!error) {
+ for (r = res; good == 0 r; r = r-ai_next) {
+ error = getnameinfo(r-ai_addr, r-ai_addrlen,
+ip, sizeof(ip), NULL, 0, NI_NUMERICHOST);
+ if (!error !strcmp(hst, ip))
+good = 1;
+ }
+ if (res)
+ freeaddrinfo(res);
}
- good = 0;
- for (r = res; good == 0 r; r = r-ai_next) {
- error = getnameinfo(r-ai_addr, r-ai_addrlen, ip, sizeof(ip),
-NULL, 0, NI_NUMERICHOST);
- if (!error !strcmp(hst, ip))
- good = 1;
- }
- if (res)
- freeaddrinfo(res);
- if (good == 0)
- fatal(address for your hostname (%s) not matched, hst);
+
+ /* complain about !good later in chkplushost if needed. */
setproctitle(serving %s, from);
@@ -639,6 +667,7 @@ chkhost(struct sockaddr *f, int check_op
hostf = fopen(_PATH_HOSTSEQUIV, r);
if (hostf) {
if (__ivaliduser_sa(hostf, f, f-sa_len, DUMMY, DUMMY) == 0) {
+ chkplushost(good, hostf, hst);
(void)fclose(hostf);
return;
}
@@ -647,6 +676,7 @@ chkhost(struct sockaddr *f, int check_op
hostf = fopen(_PATH_HOSTSLPD, r);
if (hostf) {
if (__ivaliduser_sa(hostf, f, f-sa_len, DUMMY, DUMMY) == 0) {
+ chkplushost(good, hostf, hst);
(void)fclose(hostf);
return;
}
CVS commit: src/gnu/dist/gcc4/gcc
Module Name:src
Committed By: is
Date: Mon Nov 7 20:35:39 UTC 2011
Modified Files:
src/gnu/dist/gcc4/gcc: version.c
src/gnu/dist/gcc4/gcc/config/arm: arm.md
Log Message:
Remove pattern for arith_adjacentmem in arm.md, thus fixing
PR toolchain/45576 at a very small run-time cost.
This was suggested by Richard Earnshaw.
A real fix is known to be in gcc 4.5.3 (as in NetBSD-current) and in
gcc-current; don't apply in that tree.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/gnu/dist/gcc4/gcc/version.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/gnu/dist/gcc4/gcc/config/arm/arm.md
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gcc4/gcc/version.c
diff -u src/gnu/dist/gcc4/gcc/version.c:1.18 src/gnu/dist/gcc4/gcc/version.c:1.19
--- src/gnu/dist/gcc4/gcc/version.c:1.18 Mon Jul 19 20:05:06 2010
+++ src/gnu/dist/gcc4/gcc/version.c Mon Nov 7 20:35:39 2011
@@ -8,7 +8,7 @@
in parentheses. You may also wish to include a number indicating
the revision of your modified compiler. */
-#define VERSUFFIX (NetBSD nb2 20081120)
+#define VERSUFFIX (NetBSD nb3 2007)
/* This is the location of the online document giving instructions for
reporting bugs. If you distribute a modified version of GCC,
Index: src/gnu/dist/gcc4/gcc/config/arm/arm.md
diff -u src/gnu/dist/gcc4/gcc/config/arm/arm.md:1.1.1.2 src/gnu/dist/gcc4/gcc/config/arm/arm.md:1.2
--- src/gnu/dist/gcc4/gcc/config/arm/arm.md:1.1.1.2 Sat Oct 21 23:02:40 2006
+++ src/gnu/dist/gcc4/gcc/config/arm/arm.md Mon Nov 7 20:35:39 2011
@@ -9338,109 +9338,13 @@
(set_attr length 4,8,8)]
)
-(define_insn *arith_adjacentmem
- [(set (match_operand:SI 0 s_register_operand =r)
- (match_operator:SI 1 shiftable_operator
- [(match_operand:SI 2 memory_operand m)
- (match_operand:SI 3 memory_operand m)]))
- (clobber (match_scratch:SI 4 =r))]
- TARGET_ARM adjacent_mem_locations (operands[2], operands[3])
- *
- {
-rtx ldm[3];
-rtx arith[4];
-rtx base_reg;
-HOST_WIDE_INT val1 = 0, val2 = 0;
-
-if (REGNO (operands[0]) REGNO (operands[4]))
- {
- ldm[1] = operands[4];
- ldm[2] = operands[0];
- }
-else
- {
- ldm[1] = operands[0];
- ldm[2] = operands[4];
- }
-
-base_reg = XEXP (operands[2], 0);
-
-if (!REG_P (base_reg))
- {
- val1 = INTVAL (XEXP (base_reg, 1));
- base_reg = XEXP (base_reg, 0);
- }
-
-if (!REG_P (XEXP (operands[3], 0)))
- val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1));
-
-arith[0] = operands[0];
-arith[3] = operands[1];
-
-if (val1 val2)
- {
- arith[1] = ldm[1];
- arith[2] = ldm[2];
- }
-else
- {
- arith[1] = ldm[2];
- arith[2] = ldm[1];
- }
-
-ldm[0] = base_reg;
-if (val1 !=0 val2 != 0)
- {
- rtx ops[3];
- if (val1 == 4 || val2 == 4)
- /* Other val must be 8, since we know they are adjacent and neither
- is zero. */
- output_asm_insn (\ldm%?ib\\t%0, {%1, %2}\, ldm);
- else if (const_ok_for_arm (val1) || const_ok_for_arm (-val1))
- {
- ldm[0] = ops[0] = operands[4];
- ops[1] = base_reg;
- ops[2] = GEN_INT (val1);
- output_add_immediate (ops);
- if (val1 val2)
- output_asm_insn (\ldm%?ia\\t%0, {%1, %2}\, ldm);
- else
- output_asm_insn (\ldm%?da\\t%0, {%1, %2}\, ldm);
- }
- else
- {
- /* Offset is out of range for a single add, so use two ldr. */
- ops[0] = ldm[1];
- ops[1] = base_reg;
- ops[2] = GEN_INT (val1);
- output_asm_insn (\ldr%?\\t%0, [%1, %2]\, ops);
- ops[0] = ldm[2];
- ops[2] = GEN_INT (val2);
- output_asm_insn (\ldr%?\\t%0, [%1, %2]\, ops);
- }
- }
-else if (val1 != 0)
- {
- if (val1 val2)
- output_asm_insn (\ldm%?da\\t%0, {%1, %2}\, ldm);
- else
- output_asm_insn (\ldm%?ia\\t%0, {%1, %2}\, ldm);
- }
-else
- {
- if (val1 val2)
- output_asm_insn (\ldm%?ia\\t%0, {%1, %2}\, ldm);
- else
- output_asm_insn (\ldm%?da\\t%0, {%1, %2}\, ldm);
- }
-output_asm_insn (\%I3%?\\t%0, %1, %2\, arith);
-return \\;
- }
- [(set_attr length 12)
- (set_attr predicable yes)
- (set_attr type load1)]
-)
+;-
+;arith_adjacentmem removed as a quick fix, suggested by rearnsha@
+;broken at least in gcc 4.1.3 - 4.4
+;known fixed in 4.5.3 (is@)
+;known fixed in post-4.6 trunk (rearnsha@)
+;-
; This pattern is never tried by combine, so do it as a peephole
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: is
Date: Thu Sep 29 12:51:28 UTC 2011
Modified Files:
src/sys/dev/pci: aac_pci.c
Log Message:
Use symbolic constants for SUNs version of ADP2_ASR2200S.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/aac_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/aac_pci.c
diff -u src/sys/dev/pci/aac_pci.c:1.32 src/sys/dev/pci/aac_pci.c:1.33
--- src/sys/dev/pci/aac_pci.c:1.32 Fri Feb 18 22:54:27 2011
+++ src/sys/dev/pci/aac_pci.c Thu Sep 29 12:51:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_pci.c,v 1.32 2011/02/18 22:54:27 jmcneill Exp $ */
+/* $NetBSD: aac_pci.c,v 1.33 2011/09/29 12:51:28 is Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aac_pci.c,v 1.32 2011/02/18 22:54:27 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: aac_pci.c,v 1.33 2011/09/29 12:51:28 is Exp $);
#include sys/param.h
#include sys/systm.h
@@ -406,10 +406,11 @@ static struct aac_ident {
0,
HP NetRAID-4M
},
- { 0x9005,
- 0x0285,
- 0x108e,
- 0x286,
+ {
+ PCI_VENDOR_ADP2,
+ PCI_PRODUCT_ADP2_ASR2200S,
+ PCI_VENDOR_SUN,
+ PCI_PRODUCT_ADP2_ASR2120S,
AAC_HWIF_I960RX,
0,
SG-XPCIESAS-R-IN
CVS commit: src/games/atc
Module Name:src Committed By: is Date: Tue Feb 15 08:25:26 UTC 2011 Modified Files: src/games/atc: update.c Log Message: Bug fix: in a game with 26 planes, the last one to be allocated wouldn't be allocated if it was the only eligible one. From Jonathan David Amery via Debian Bug report 214626. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/games/atc/update.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/atc/update.c diff -u src/games/atc/update.c:1.21 src/games/atc/update.c:1.22 --- src/games/atc/update.c:1.21 Wed Aug 12 04:48:03 2009 +++ src/games/atc/update.c Tue Feb 15 08:25:25 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: update.c,v 1.21 2009/08/12 04:48:03 dholland Exp $ */ +/* $NetBSD: update.c,v 1.22 2011/02/15 08:25:25 is Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ #if 0 static char sccsid[] = @(#)update.c 8.1 (Berkeley) 5/31/93; #else -__RCSID($NetBSD: update.c,v 1.21 2009/08/12 04:48:03 dholland Exp $); +__RCSID($NetBSD: update.c,v 1.22 2011/02/15 08:25:25 is Exp $); #endif #endif /* not lint */ @@ -302,7 +302,7 @@ break; } } while (found last_plane != start_plane); - if (last_plane == start_plane) + if (found) return (-1); return (last_plane); }
CVS commit: src/sys/dev/usb
Module Name:src Committed By: is Date: Sun Jan 9 14:30:36 UTC 2011 Modified Files: src/sys/dev/usb: usbdevs Log Message: some more 8187B variants. From OpenBSD To generate a diff of this commit: cvs rdiff -u -r1.574 -r1.575 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.574 src/sys/dev/usb/usbdevs:1.575 --- src/sys/dev/usb/usbdevs:1.574 Sat Jan 8 22:02:49 2011 +++ src/sys/dev/usb/usbdevs Sun Jan 9 14:30:36 2011 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.574 2011/01/08 22:02:49 is Exp $ +$NetBSD: usbdevs,v 1.575 2011/01/09 14:30:36 is Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2287,7 +2287,9 @@ product REALTEK RTL8150L 0x8150 RTL8150L USB-Ethernet Bridge product REALTEK RTL8151 0x8151 RTL8151 PNA product REALTEK RTL8187 0x8187 RTL8187 -product REALTEK RTL8187B 0x8189 RTL8187B WLAN Adapter +product REALTEK RTL8187B_0 0x8189 RTL8187B +product REALTEK RTL8187B_1 0x8197 RTL8187B +product REALTEK RTL8187B_2 0x8198 RTL8187B /* Research In Motion */ product RIM BLACKBERRY 0x0001 BlackBerry
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: is
Date: Sun Jan 9 14:32:36 UTC 2011
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
some more 8187B variants. From OpenBSD
To generate a diff of this commit:
cvs rdiff -u -r1.567 -r1.568 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.568 -r1.569 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.567 src/sys/dev/usb/usbdevs.h:1.568
--- src/sys/dev/usb/usbdevs.h:1.567 Sat Jan 8 22:04:19 2011
+++ src/sys/dev/usb/usbdevs.h Sun Jan 9 14:32:36 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.567 2011/01/08 22:04:19 is Exp $ */
+/* $NetBSD: usbdevs.h,v 1.568 2011/01/09 14:32:36 is Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.574 2011/01/08 22:02:49 is Exp
+ * NetBSD: usbdevs,v 1.575 2011/01/09 14:30:36 is Exp
*/
/*
@@ -2294,7 +2294,9 @@
#define USB_PRODUCT_REALTEK_RTL8150L 0x8150 /* RTL8150L USB-Ethernet Bridge */
#define USB_PRODUCT_REALTEK_RTL8151 0x8151 /* RTL8151 PNA */
#define USB_PRODUCT_REALTEK_RTL8187 0x8187 /* RTL8187 */
-#define USB_PRODUCT_REALTEK_RTL8187B 0x8189 /* RTL8187B WLAN Adapter */
+#define USB_PRODUCT_REALTEK_RTL8187B_0 0x8189 /* RTL8187B */
+#define USB_PRODUCT_REALTEK_RTL8187B_1 0x8197 /* RTL8187B */
+#define USB_PRODUCT_REALTEK_RTL8187B_2 0x8198 /* RTL8187B */
/* Research In Motion */
#define USB_PRODUCT_RIM_BLACKBERRY 0x0001 /* BlackBerry */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.568 src/sys/dev/usb/usbdevs_data.h:1.569
--- src/sys/dev/usb/usbdevs_data.h:1.568 Sat Jan 8 22:04:19 2011
+++ src/sys/dev/usb/usbdevs_data.h Sun Jan 9 14:32:36 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.568 2011/01/08 22:04:19 is Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.569 2011/01/09 14:32:36 is Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.574 2011/01/08 22:02:49 is Exp
+ * NetBSD: usbdevs,v 1.575 2011/01/09 14:30:36 is Exp
*/
/*
@@ -6823,8 +6823,16 @@
RTL8187,
},
{
- USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B,
- RTL8187B WLAN Adapter,
+ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_0,
+ RTL8187B,
+ },
+ {
+ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_1,
+ RTL8187B,
+ },
+ {
+ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_2,
+ RTL8187B,
},
{
USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY,
@@ -8391,4 +8399,4 @@
Prestige,
},
};
-const int usb_nproducts = 1597;
+const int usb_nproducts = 1599;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: is
Date: Sat Jan 8 22:04:20 UTC 2011
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Realtek 8187B
To generate a diff of this commit:
cvs rdiff -u -r1.566 -r1.567 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.567 -r1.568 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.566 src/sys/dev/usb/usbdevs.h:1.567
--- src/sys/dev/usb/usbdevs.h:1.566 Thu Dec 30 19:28:52 2010
+++ src/sys/dev/usb/usbdevs.h Sat Jan 8 22:04:19 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.566 2010/12/30 19:28:52 jakllsch Exp $ */
+/* $NetBSD: usbdevs.h,v 1.567 2011/01/08 22:04:19 is Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.573 2010/12/30 19:27:51 jakllsch Exp
+ * NetBSD: usbdevs,v 1.574 2011/01/08 22:02:49 is Exp
*/
/*
@@ -2294,6 +2294,7 @@
#define USB_PRODUCT_REALTEK_RTL8150L 0x8150 /* RTL8150L USB-Ethernet Bridge */
#define USB_PRODUCT_REALTEK_RTL8151 0x8151 /* RTL8151 PNA */
#define USB_PRODUCT_REALTEK_RTL8187 0x8187 /* RTL8187 */
+#define USB_PRODUCT_REALTEK_RTL8187B 0x8189 /* RTL8187B WLAN Adapter */
/* Research In Motion */
#define USB_PRODUCT_RIM_BLACKBERRY 0x0001 /* BlackBerry */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.567 src/sys/dev/usb/usbdevs_data.h:1.568
--- src/sys/dev/usb/usbdevs_data.h:1.567 Thu Dec 30 19:28:52 2010
+++ src/sys/dev/usb/usbdevs_data.h Sat Jan 8 22:04:19 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.567 2010/12/30 19:28:52 jakllsch Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.568 2011/01/08 22:04:19 is Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.573 2010/12/30 19:27:51 jakllsch Exp
+ * NetBSD: usbdevs,v 1.574 2011/01/08 22:02:49 is Exp
*/
/*
@@ -6823,6 +6823,10 @@
RTL8187,
},
{
+ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B,
+ RTL8187B WLAN Adapter,
+ },
+ {
USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY,
BlackBerry,
},
@@ -8387,4 +8391,4 @@
Prestige,
},
};
-const int usb_nproducts = 1596;
+const int usb_nproducts = 1597;
CVS commit: src/share/man/man4
Module Name:src Committed By: is Date: Sun Jan 2 12:11:47 UTC 2011 Modified Files: src/share/man/man4: stf.4 Log Message: Four and a half year after the end of 6bone, it should not surprise that the web page dedicated to it is gone. Fortunately, 6bone itself is not referenced in this manual page. Thanks to an...@ircnet for the heads-up. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man4/stf.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/stf.4 diff -u src/share/man/man4/stf.4:1.21 src/share/man/man4/stf.4:1.22 --- src/share/man/man4/stf.4:1.21 Sat Jun 17 04:58:14 2006 +++ src/share/man/man4/stf.4 Sun Jan 2 12:11:46 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: stf.4,v 1.21 2006/06/17 04:58:14 reed Exp $ +.\ $NetBSD: stf.4,v 1.22 2011/01/02 12:11:46 is Exp $ .\ $KAME: stf.4,v 1.39 2002/11/17 19:34:02 itojun Exp $ .\ .\ Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -234,7 +234,6 @@ .Xr inet 4 , .Xr inet6 4 .Pp -.Pa http://www.6bone.net/6bone_6to4.html .Rs .%A Brian Carpenter .%A Keith Moore
CVS commit: src/share/man/man4
Module Name:src Committed By: is Date: Sun Jan 2 12:25:31 UTC 2011 Modified Files: src/share/man/man4: stf.4 Log Message: Add references RFC3068 and RFC3964; mark draft-itojun-... as expired. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man4/stf.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/stf.4 diff -u src/share/man/man4/stf.4:1.22 src/share/man/man4/stf.4:1.23 --- src/share/man/man4/stf.4:1.22 Sun Jan 2 12:11:46 2011 +++ src/share/man/man4/stf.4 Sun Jan 2 12:25:30 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: stf.4,v 1.22 2011/01/02 12:11:46 is Exp $ +.\ $NetBSD: stf.4,v 1.23 2011/01/02 12:25:30 is Exp $ .\ $KAME: stf.4,v 1.39 2002/11/17 19:34:02 itojun Exp $ .\ .\ Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -243,6 +243,13 @@ .%N 3056 .Re .Rs +.%A C. Huitema +.%T An Anycast Prefix for 6to4 Relay Routers +.%D June 2001 +.%R RFC +.%N 3068 +.Re +.Rs .%A F. Baker .%A P. Savola .%T Ingress Filtering for Multihomed Networks @@ -251,11 +258,19 @@ .%N 3704 .Re .Rs +.%A P. Savola +.%A C. Patel +.%T Security Considerations for 6to4 +.%D December 2004 +.%R RFC +.%N 3964 +.Re +.Rs .%A Jun-ichiro itojun Hagino .%T Possible abuse against IPv6 transition technologies .%D July 2000 .%N draft-itojun-ipv6-transition-abuse-01.txt -.%O work in progress +.%O expired, work in progress .Re .\ .Sh HISTORY
CVS commit: src/share/misc
Module Name:src Committed By: is Date: Sun Nov 28 16:08:28 UTC 2010 Modified Files: src/share/misc: acronyms Log Message: Add BCP. To generate a diff of this commit: cvs rdiff -u -r1.192 -r1.193 src/share/misc/acronyms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms diff -u src/share/misc/acronyms:1.192 src/share/misc/acronyms:1.193 --- src/share/misc/acronyms:1.192 Mon Oct 25 06:14:10 2010 +++ src/share/misc/acronyms Sun Nov 28 16:08:28 2010 @@ -1,4 +1,4 @@ -$NetBSD: acronyms,v 1.192 2010/10/25 06:14:10 jruoho Exp $ +$NetBSD: acronyms,v 1.193 2010/11/28 16:08:28 is Exp $ AEAP as early as possible AFAIC as far as I'm concerned AFAICR as far as I can recall @@ -31,6 +31,7 @@ BBT be back tomorrow BCNU be seeing you BCNUL8R be seeing you later +BCP best current practice BFD big fucking deal BFH big fucking hammer BIAB back in a bit
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: is
Date: Fri May 7 13:59:52 UTC 2010
Modified Files:
src/sys/dev/pci: aac_pci.c
Log Message:
SUN X4140's version of this board. From FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/aac_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/aac_pci.c
diff -u src/sys/dev/pci/aac_pci.c:1.30 src/sys/dev/pci/aac_pci.c:1.31
--- src/sys/dev/pci/aac_pci.c:1.30 Thu Nov 26 15:17:08 2009
+++ src/sys/dev/pci/aac_pci.c Fri May 7 13:59:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_pci.c,v 1.30 2009/11/26 15:17:08 njoly Exp $ */
+/* $NetBSD: aac_pci.c,v 1.31 2010/05/07 13:59:51 is Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aac_pci.c,v 1.30 2009/11/26 15:17:08 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: aac_pci.c,v 1.31 2010/05/07 13:59:51 is Exp $);
#include sys/param.h
#include sys/systm.h
@@ -398,6 +398,14 @@
0,
HP NetRAID-4M
},
+ { 0x9005,
+ 0x0285,
+ 0x108e,
+ 0x286,
+ AAC_HWIF_I960RX,
+ 0,
+ SG-XPCIESAS-R-IN
+ },
};
static const struct aac_ident *
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: is
Date: Sat Jan 30 18:30:33 UTC 2010
Modified Files:
src/sbin/ifconfig: af_atalk.c
Log Message:
Use getnameinfo() for printing AppleTalk addresses. While here, fix
printing of broadcast for this address family (AT broadcast is fixed
node 255 on the local net).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/ifconfig/af_atalk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_atalk.c
diff -u src/sbin/ifconfig/af_atalk.c:1.15 src/sbin/ifconfig/af_atalk.c:1.16
--- src/sbin/ifconfig/af_atalk.c:1.15 Fri Aug 1 22:44:17 2008
+++ src/sbin/ifconfig/af_atalk.c Sat Jan 30 18:30:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: af_atalk.c,v 1.15 2008/08/01 22:44:17 dyoung Exp $ */
+/* $NetBSD: af_atalk.c,v 1.16 2010/01/30 18:30:33 is Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: af_atalk.c,v 1.15 2008/08/01 22:44:17 dyoung Exp $);
+__RCSID($NetBSD: af_atalk.c,v 1.16 2010/01/30 18:30:33 is Exp $);
#endif /* not lint */
#include sys/param.h
@@ -42,6 +42,8 @@
#include netatalk/at.h
+#include netdb.h
+
#include err.h
#include errno.h
#include string.h
@@ -177,19 +179,20 @@
}
static void
-sat_print(const char *prefix, const struct sockaddr *sa)
+sat_print1(const char *prefix, const struct sockaddr *sa)
{
- const struct sockaddr_at *sat = satocsat(sa);
+ char buf[40];
+ int rc;
- printf(%s%d.%d, prefix, ntohs(sat-sat_addr.s_net),
- sat-sat_addr.s_node);
+ rc = getnameinfo(sa, sa-sa_len, buf, sizeof(buf), NULL, 0, 0);
+
+ printf(%s%s, prefix, buf);
}
static void
at_status(prop_dictionary_t env, prop_dictionary_t oenv, bool force)
{
struct sockaddr_at *sat;
- struct netrange *nr;
struct ifreq ifr;
int s;
const char *ifname;
@@ -216,10 +219,7 @@
warn(SIOCGIFADDR);
sat = (struct sockaddr_at *)ifr.ifr_addr;
- nr = (struct netrange *)sat-sat_zero;
- sat_print(\tatalk , ifr.ifr_addr);
- printf( range %d-%d phase %d,
- ntohs(nr-nr_firstnet), ntohs(nr-nr_lastnet), nr-nr_phase);
+ sat_print1(\tatalk , ifr.ifr_addr);
if (flags IFF_POINTOPOINT) {
estrlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
@@ -229,11 +229,13 @@
else
warn(SIOCGIFDSTADDR);
}
- sat_print( -- , ifr.ifr_dstaddr);
+ sat_print1( -- , ifr.ifr_dstaddr);
}
if (flags IFF_BROADCAST) {
/* note RTAX_BRD overlap with IFF_POINTOPOINT */
- sat_print( broadcast , ifr.ifr_broadaddr);
+ /* note Appletalk broadcast is fixed. */
+ printf( broadcast %u.%u, ntohs(sat-sat_addr.s_net),
+ ATADDR_BCAST);
}
printf(\n);
}
CVS commit: src/sys/netatalk
Module Name:src
Committed By: is
Date: Sat Jan 30 21:48:30 UTC 2010
Modified Files:
src/sys/netatalk: at_control.c
Log Message:
Use the symbolic names. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/netatalk/at_control.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netatalk/at_control.c
diff -u src/sys/netatalk/at_control.c:1.32 src/sys/netatalk/at_control.c:1.33
--- src/sys/netatalk/at_control.c:1.32 Sat Apr 18 14:58:05 2009
+++ src/sys/netatalk/at_control.c Sat Jan 30 21:48:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: at_control.c,v 1.32 2009/04/18 14:58:05 tsutsui Exp $ */
+/* $NetBSD: at_control.c,v 1.33 2010/01/30 21:48:30 is Exp $ */
/*
* Copyright (c) 1990,1994 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: at_control.c,v 1.32 2009/04/18 14:58:05 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: at_control.c,v 1.33 2010/01/30 21:48:30 is Exp $);
#include sys/param.h
#include sys/systm.h
@@ -609,8 +609,8 @@
aa-aa_ifa.ifa_metric = ifp-if_metric;
if (ifp-if_flags IFF_BROADCAST) {
- aa-aa_broadaddr.sat_addr.s_net = htons(0);
- aa-aa_broadaddr.sat_addr.s_node = 0xff;
+ aa-aa_broadaddr.sat_addr.s_net = htons(ATADDR_ANYNET);
+ aa-aa_broadaddr.sat_addr.s_node = ATADDR_BCAST;
aa-aa_ifa.ifa_broadaddr =
(struct sockaddr *) aa-aa_broadaddr;
/* add the range of routes needed */
CVS commit: src/lib/libc/net
Module Name:src
Committed By: is
Date: Fri Jan 29 22:26:48 UTC 2010
Modified Files:
src/lib/libc/net: getnameinfo.c
Log Message:
Print AppleTalk phase 2 range, too, if available.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/lib/libc/net/getnameinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getnameinfo.c
diff -u src/lib/libc/net/getnameinfo.c:1.48 src/lib/libc/net/getnameinfo.c:1.49
--- src/lib/libc/net/getnameinfo.c:1.48 Tue Jan 26 21:27:54 2010
+++ src/lib/libc/net/getnameinfo.c Fri Jan 29 22:26:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: getnameinfo.c,v 1.48 2010/01/26 21:27:54 is Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.49 2010/01/29 22:26:48 is Exp $ */
/* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */
/*
@@ -47,7 +47,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: getnameinfo.c,v 1.48 2010/01/26 21:27:54 is Exp $);
+__RCSID($NetBSD: getnameinfo.c,v 1.49 2010/01/29 22:26:48 is Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -150,7 +150,7 @@
int flags)
{
char numserv[8];
- int n;
+ int n, m=0;
const struct sockaddr_at *sat =
(const struct sockaddr_at *)(const void *)sa;
@@ -162,21 +162,41 @@
strlcpy(serv, numserv, servlen);
}
+n = snprintf(host, hostlen, %u.%u,
+ ntohs(sat-sat_addr.s_net), sat-sat_addr.s_node);
+
+ if (n 0 || (socklen_t)(m+n) = hostlen)
+ goto errout;
+
+ m += n;
+
if (sat-sat_range.r_netrange.nr_phase) {
- n = snprintf(host, hostlen, %u.%u phase %u,
- ntohs(sat-sat_addr.s_net), sat-sat_addr.s_node,
+ n = snprintf(host+m, hostlen-m, phase %u,
sat-sat_range.r_netrange.nr_phase);
- } else {
- n = snprintf(host, hostlen, %u.%u,
- ntohs(sat-sat_addr.s_net), sat-sat_addr.s_node);
+
+ if (n 0 || (socklen_t)(m+n) = hostlen)
+ goto errout;
+
+ m += n;
}
+ if (sat-sat_range.r_netrange.nr_firstnet) {
+ n = snprintf(host+m, hostlen-m, range %u - %u,
+ ntohs(sat-sat_range.r_netrange.nr_firstnet),
+ ntohs(sat-sat_range.r_netrange.nr_lastnet ));
+
+ if (n 0 || (socklen_t)(m+n) = hostlen)
+ goto errout;
- if (n 0 || (socklen_t) n = hostlen) {
- if (host != NULL hostlen 0)
- *host = '\0'; /* XXX ??? */
- return EAI_MEMORY;
+ m += n;
}
+
return 0;
+
+errout:
+ if (host hostlen0)
+ host[m] = '\0'; /* XXX ??? */
+
+ return EAI_MEMORY;
}
/*
CVS commit: src
Module Name:src
Committed By: is
Date: Tue Jan 26 21:27:55 UTC 2010
Modified Files:
src/lib/libc/net: getnameinfo.c
src/sbin/route: show.c
Log Message:
Add AF_APPLETALK support to getnameinfo(); make route show use it.
Doesn't print ranges yet (should it be done here?); only numeric
output.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/lib/libc/net/getnameinfo.c
cvs rdiff -u -r1.39 -r1.40 src/sbin/route/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getnameinfo.c
diff -u src/lib/libc/net/getnameinfo.c:1.47 src/lib/libc/net/getnameinfo.c:1.48
--- src/lib/libc/net/getnameinfo.c:1.47 Wed Aug 12 20:24:30 2009
+++ src/lib/libc/net/getnameinfo.c Tue Jan 26 21:27:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: getnameinfo.c,v 1.47 2009/08/12 20:24:30 seanb Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.48 2010/01/26 21:27:54 is Exp $ */
/* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */
/*
@@ -47,7 +47,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: getnameinfo.c,v 1.47 2009/08/12 20:24:30 seanb Exp $);
+__RCSID($NetBSD: getnameinfo.c,v 1.48 2010/01/26 21:27:54 is Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -57,6 +57,7 @@
#include net/if_dl.h
#include net/if_ieee1394.h
#include net/if_types.h
+#include netatalk/at.h
#include netinet/in.h
#include arpa/inet.h
#include arpa/nameser.h
@@ -102,6 +103,9 @@
static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t,
int));
#endif
+static int getnameinfo_atalk __P((const struct sockaddr *, socklen_t, char *,
+socklen_t, char *, socklen_t, int));
+
static int getnameinfo_link __P((const struct sockaddr *, socklen_t, char *,
socklen_t, char *, socklen_t, int));
static int hexname __P((const u_int8_t *, size_t, char *, socklen_t));
@@ -120,6 +124,9 @@
{
switch (sa-sa_family) {
+ case AF_APPLETALK:
+ return getnameinfo_atalk(sa, salen, host, hostlen,
+ serv, servlen, flags);
case AF_INET:
case AF_INET6:
return getnameinfo_inet(sa, salen, host, hostlen,
@@ -132,6 +139,45 @@
}
}
+/*
+ * getnameinfo_atalk():
+ * Format an AppleTalk address into a printable format.
+ */
+/* ARGSUSED */
+static int
+getnameinfo_atalk(const struct sockaddr *sa, socklen_t salen,
+char *host, socklen_t hostlen, char *serv, socklen_t servlen,
+int flags)
+{
+ char numserv[8];
+ int n;
+
+ const struct sockaddr_at *sat =
+ (const struct sockaddr_at *)(const void *)sa;
+
+ if (serv != NULL servlen 0) {
+ snprintf(numserv, sizeof(numserv), %u, sat-sat_port);
+ if (strlen(numserv) + 1 servlen)
+ return EAI_MEMORY;
+ strlcpy(serv, numserv, servlen);
+ }
+
+ if (sat-sat_range.r_netrange.nr_phase) {
+ n = snprintf(host, hostlen, %u.%u phase %u,
+ ntohs(sat-sat_addr.s_net), sat-sat_addr.s_node,
+ sat-sat_range.r_netrange.nr_phase);
+ } else {
+ n = snprintf(host, hostlen, %u.%u,
+ ntohs(sat-sat_addr.s_net), sat-sat_addr.s_node);
+ }
+
+ if (n 0 || (socklen_t) n = hostlen) {
+ if (host != NULL hostlen 0)
+ *host = '\0'; /* XXX ??? */
+ return EAI_MEMORY;
+ }
+ return 0;
+}
/*
* getnameinfo_inet():
Index: src/sbin/route/show.c
diff -u src/sbin/route/show.c:1.39 src/sbin/route/show.c:1.40
--- src/sbin/route/show.c:1.39 Tue Mar 17 00:53:42 2009
+++ src/sbin/route/show.c Tue Jan 26 21:27:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: show.c,v 1.39 2009/03/17 00:53:42 lukem Exp $ */
+/* $NetBSD: show.c,v 1.40 2010/01/26 21:27:54 is Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)route.c 8.3 (Berkeley) 3/9/94;
#else
-__RCSID($NetBSD: show.c,v 1.39 2009/03/17 00:53:42 lukem Exp $);
+__RCSID($NetBSD: show.c,v 1.40 2010/01/26 21:27:54 is Exp $);
#endif
#endif /* not lint */
@@ -363,6 +363,13 @@
#endif /* INET6 */
#ifndef SMALL
+ case AF_APPLETALK:
+ if (getnameinfo(sa, sa-sa_len, workbuf, sizeof(workbuf),
+ NULL, 0, NI_NUMERICHOST) != 0)
+ strlcpy(workbuf, invalid, sizeof(workbuf));
+ cp = workbuf;
+ break;
+
#endif /* SMALL */
default:
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: is
Date: Fri Oct 30 16:22:32 UTC 2009
Modified Files:
src/sys/dev/usb: umass.c umass_quirks.c umassvar.h usbdevs
Log Message:
Quirk to regenerate residue for borken UMASS devices; needed (at least)
for Supertop IDE bridge. From Matthias Kretschmer, PR 42225.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/umass_quirks.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/umassvar.h
cvs rdiff -u -r1.534 -r1.535 src/sys/dev/usb/usbdevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.134 src/sys/dev/usb/umass.c:1.135
--- src/sys/dev/usb/umass.c:1.134 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/umass.c Fri Oct 30 16:22:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.134 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: umass.c,v 1.135 2009/10/30 16:22:32 is Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.134 2009/09/23 19:07:19 plunky Exp $);
+__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.135 2009/10/30 16:22:32 is Exp $);
#include atapibus.h
#include scsibus.h
@@ -1012,6 +1012,7 @@
{
struct umass_softc *sc = (struct umass_softc *) priv;
usbd_xfer_handle next_xfer;
+ int residue;
KASSERT(sc-sc_wire UMASS_WPROTO_BBB,
(sc-sc_wire == 0x%02x wrong for umass_bbb_state\n,
@@ -1184,6 +1185,11 @@
DIF(UDMASS_BBB, umass_bbb_dump_csw(sc, sc-csw));
+ if (sc-sc_quirks UMASS_QUIRK_IGNORE_RESIDUE)
+residue = sc-transfer_datalen - sc-transfer_actlen;
+else
+residue = UGETDW(sc-csw.dCSWDataResidue);
+
/* Translate weird command-status signatures. */
if ((sc-sc_quirks UMASS_QUIRK_WRONG_CSWSIG)
UGETDW(sc-csw.dCSWSignature) == CSWSIGNATURE_OLYMPUS_C1)
@@ -1226,8 +1232,7 @@
return;
} else if (sc-csw.bCSWStatus == CSWSTATUS_PHASE) {
printf(%s: Phase Error, residue = %d\n,
-device_xname(sc-sc_dev),
-UGETDW(sc-csw.dCSWDataResidue));
+device_xname(sc-sc_dev), residue);
umass_bbb_reset(sc, STATUS_WIRE_FAILED);
return;
@@ -1239,32 +1244,29 @@
sc-transfer_actlen, sc-transfer_datalen);
#if 0
} else if (sc-transfer_datalen - sc-transfer_actlen
- != UGETDW(sc-csw.dCSWDataResidue)) {
+ != residue) {
DPRINTF(UDMASS_BBB, (%s: actlen=%d != residue=%d\n,
device_xname(sc-sc_dev),
sc-transfer_datalen - sc-transfer_actlen,
-UGETDW(sc-csw.dCSWDataResidue)));
+residue));
umass_bbb_reset(sc, STATUS_WIRE_FAILED);
return;
#endif
} else if (sc-csw.bCSWStatus == CSWSTATUS_FAILED) {
DPRINTF(UDMASS_BBB, (%s: Command Failed, res = %d\n,
-device_xname(sc-sc_dev),
-UGETDW(sc-csw.dCSWDataResidue)));
+device_xname(sc-sc_dev), residue));
/* SCSI command failed but transfer was succesful */
sc-transfer_state = TSTATE_IDLE;
- sc-transfer_cb(sc, sc-transfer_priv,
- UGETDW(sc-csw.dCSWDataResidue),
+ sc-transfer_cb(sc, sc-transfer_priv, residue,
STATUS_CMD_FAILED);
return;
} else { /* success */
sc-transfer_state = TSTATE_IDLE;
- sc-transfer_cb(sc, sc-transfer_priv,
- UGETDW(sc-csw.dCSWDataResidue),
+ sc-transfer_cb(sc, sc-transfer_priv, residue,
STATUS_CMD_OK);
return;
Index: src/sys/dev/usb/umass_quirks.c
diff -u src/sys/dev/usb/umass_quirks.c:1.77 src/sys/dev/usb/umass_quirks.c:1.78
--- src/sys/dev/usb/umass_quirks.c:1.77 Mon Oct 12 23:43:05 2009
+++ src/sys/dev/usb/umass_quirks.c Fri Oct 30 16:22:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_quirks.c,v 1.77 2009/10/12 23:43:05 wiz Exp $ */
+/* $NetBSD: umass_quirks.c,v 1.78 2009/10/30 16:22:32 is Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umass_quirks.c,v 1.77 2009/10/12 23:43:05 wiz Exp $);
+__KERNEL_RCSID(0, $NetBSD: umass_quirks.c,v 1.78 2009/10/30 16:22:32 is Exp $);
#include sys/param.h
#include sys/systm.h
@@ -229,6 +229,17 @@
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
+
+/*
+ * Devices with bad residue.
+ */
+{ { USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDEBRIDGE },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ UMASS_QUIRK_IGNORE_RESIDUE,
+ 0,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+},
};
const struct umass_quirk *
Index: src/sys/dev/usb/umassvar.h
diff -u src/sys/dev/usb/umassvar.h:1.27 src/sys/dev/usb/umassvar.h:1.28
--- src/sys/dev/usb/umassvar.h:1.27 Sat Sep 6 21:49:00 2008
+++ src/sys/dev/usb/umassvar.h Fri Oct 30 16:22:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: umassvar.h,v 1.27 2008/09/06 21:49:00 rmind Exp $ */
+/* $NetBSD: umassvar.h,v 1.28 2009/10/30 16:22:32 is Exp $ */
/*-
