CVS commit: [netbsd-7] src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: martin
Date: Thu Nov 27 11:20:36 UTC 2014
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore [netbsd-7]:
DNSCommon.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #267):
external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c: revision 1.5
Change the mDNSPlatformRawTime went backwards message from LogMsg to
debugf. It's not that interesting, as it is comparing the results of two
gettimeofday() calls.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.4 src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.4.4.1
--- src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.4 Mon Mar 31 23:26:30 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Thu Nov 27 11:20:36 2014
@@ -2697,7 +2697,7 @@ mDNSexport void mDNS_Lock_(mDNS *const m
if (m-timenow_last - m-timenow 0)
{
m-timenow_adjust += m-timenow_last - m-timenow;
- LogMsg(%s: mDNSPlatformRawTime went backwards by %ld ticks; setting correction factor to %ld, functionname, m-timenow_last - m-timenow, m-timenow_adjust);
+ debugf(%s: mDNSPlatformRawTime went backwards by %ld ticks; setting correction factor to %ld, functionname, m-timenow_last - m-timenow, m-timenow_adjust);
m-timenow = m-timenow_last;
}
m-timenow_last = m-timenow;
CVS commit: [netbsd-7] src/distrib/utils/embedded/conf
Module Name:src
Committed By: martin
Date: Thu Nov 27 11:23:04 UTC 2014
Modified Files:
src/distrib/utils/embedded/conf [netbsd-7]: evbarm.conf
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #268):
distrib/utils/embedded/conf/evbarm.conf: revision 1.17
disable wapbl for evbarm images until stability issues are sorted out
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.4.1 src/distrib/utils/embedded/conf/evbarm.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.15 src/distrib/utils/embedded/conf/evbarm.conf:1.15.4.1
--- src/distrib/utils/embedded/conf/evbarm.conf:1.15 Mon Mar 31 17:05:03 2014
+++ src/distrib/utils/embedded/conf/evbarm.conf Thu Nov 27 11:23:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.15 2014/03/31 17:05:03 christos Exp $
+# $NetBSD: evbarm.conf,v 1.15.4.1 2014/11/27 11:23:04 martin Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -69,7 +69,7 @@ make_fstab_evbarm_normal() {
cat ${mnt}/etc/fstab EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
-/dev/ld0a / ffs rw,log 1 1
+/dev/ld0a / ffs rw 1 1
/dev/ld0b none swap sw 0 0
/dev/ld0e /boot msdos rw 1 1
kernfs /kern kernfs rw
CVS commit: [netbsd-7] src
Module Name:src
Committed By: martin
Date: Thu Nov 27 11:36:25 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkadm5srv [netbsd-7]: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest [netbsd-7]: Makefile
src/distrib/sets/lists/comp [netbsd-7]: mi
src/distrib/sets/lists/man [netbsd-7]: mi
Log Message:
Pull up following revision(s) (requested by pettai in ticket #269):
crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile: revision 1.3
distrib/sets/lists/comp/mi: revision 1.1924-1.1929
distrib/sets/lists/man/mi: revision 1.1489
crypto/external/bsd/heimdal/sbin/kdigest/Makefile: revision 1.3
Add kdigest(8) and some more man references to kadm5_pwcheck(3).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
cvs rdiff -u -r1.2 -r1.2.24.1 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.1906.2.1 -r1.1906.2.2 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1485.2.2 -r1.1485.2.3 src/distrib/sets/lists/man/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.2.4.1
--- src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.2 Wed Sep 11 23:04:09 2013
+++ src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile Thu Nov 27 11:36:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2014/11/27 11:36:25 martin Exp $
USE_FORT?= yes # network protocol library
@@ -48,5 +48,11 @@ SRCS =\
MAN= kadm5_pwcheck.3
+MLINKS= \
+kadm5_pwcheck.3 kadm5_setup_passwd_quality_check.3\
+kadm5_pwcheck.3 kadm5_add_passwd_quality_verifier.3\
+kadm5_pwcheck.3 kadm5_check_password_quality.3\
+kadm5_pwcheck.3 krb5_pwcheck.3\
+
.include ${HEIMBASE}/Makefile.rules.inc
.include bsd.lib.mk
Index: src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.2 src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.2.24.1
--- src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.2 Wed May 25 19:21:19 2011
+++ src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile Thu Nov 27 11:36:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
+# $NetBSD: Makefile,v 1.2.24.1 2014/11/27 11:36:25 martin Exp $
.include bsd.own.mk
.include ${.CURDIR}/../../Makefile.inc
@@ -6,8 +6,7 @@
.PATH: ${HEIMDIST}/kuser
PROG= kdigest
-# no man-page yet
-MAN=
+MAN= kdigest.8
HEIMSRCS+= kdigest.c kdigest-commands.in
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1906.2.1 src/distrib/sets/lists/comp/mi:1.1906.2.2
--- src/distrib/sets/lists/comp/mi:1.1906.2.1 Mon Oct 13 20:05:15 2014
+++ src/distrib/sets/lists/comp/mi Thu Nov 27 11:36:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1906.2.1 2014/10/13 20:05:15 martin Exp $
+# $NetBSD: mi,v 1.1906.2.2 2014/11/27 11:36:25 martin Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -7087,7 +7087,10 @@
./usr/share/man/cat3/jn.0 comp-c-catman .cat
./usr/share/man/cat3/jnf.0 comp-c-catman .cat
./usr/share/man/cat3/jrand48.0 comp-c-catman .cat
+./usr/share/man/cat3/kadm5_add_passwd_quality_verifier.0 comp-krb5-catman kerberos,.cat
+./usr/share/man/cat3/kadm5_check_password_quality.0 comp-krb5-catman kerberos,.cat
./usr/share/man/cat3/kadm5_pwcheck.0 comp-krb5-catman kerberos,.cat
+./usr/share/man/cat3/kadm5_setup_passwd_quality_check.0 comp-krb5-catman kerberos,.cat
./usr/share/man/cat3/kafs.0 comp-krb5-catman kerberos,.cat
./usr/share/man/cat3/kerberos.0 comp-obsolete obsolete
./usr/share/man/cat3/keyname.0 comp-c-catman .cat
@@ -7505,6 +7508,7 @@
./usr/share/man/cat3/krb5_print_address.0 comp-obsolete obsolete
./usr/share/man/cat3/krb5_prompt.0 comp-krb5-catman kerberos,.cat
./usr/share/man/cat3/krb5_prompter_posix.0 comp-krb5-catman kerberos,.cat
+./usr/share/man/cat3/krb5_pwcheck.0 comp-krb5-catman kerberos,.cat
./usr/share/man/cat3/krb5_random_to_key.0 comp-obsolete obsolete
./usr/share/man/cat3/krb5_rc_close.0 comp-krb5-catman kerberos,.cat
./usr/share/man/cat3/krb5_rc_default.0 comp-krb5-catman kerberos,.cat
@@ -13935,7 +13939,10 @@
./usr/share/man/html3/jn.html comp-c-htmlman html
./usr/share/man/html3/jnf.html comp-c-htmlman html
./usr/share/man/html3/jrand48.html comp-c-htmlman html
+./usr/share/man/html3/kadm5_add_passwd_quality_verifier.html comp-krb5-htmlman kerberos,html
+./usr/share/man/html3/kadm5_check_password_quality.html comp-krb5-htmlman kerberos,html
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Nov 27 11:39:44 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #267 - #269 To generate a diff of this commit: cvs rdiff -u -r1.1.2.111 -r1.1.2.112 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.111 src/doc/CHANGES-7.0:1.1.2.112 --- src/doc/CHANGES-7.0:1.1.2.111 Tue Nov 25 15:53:38 2014 +++ src/doc/CHANGES-7.0 Thu Nov 27 11:39:44 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.111 2014/11/25 15:53:38 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.112 2014/11/27 11:39:44 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -2974,3 +2974,23 @@ sys/arch/evbarm/conf/RPI (patch) Remove DEBUG option. [skrll, ticket #265] +external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c 1.5 + + Change the mDNSPlatformRawTime went backwards message from LogMsg + to debugf. It's not that interesting, as it is comparing the results + of two gettimeofday() calls. + [jmcneill, ticket #267] + +distrib/utils/embedded/conf/evbarm.conf 1.17 + + Disable wapbl for evbarm images until stability issues are sorted out. + [jmcneill, ticket #268] + +crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile 1.3 +crypto/external/bsd/heimdal/sbin/kdigest/Makefile 1.3 +distrib/sets/lists/comp/mi 1.1924-1.1929 +distrib/sets/lists/man/mi 1.1489 + + Add kdigest(8) and some more man references to kadm5_pwcheck(3). + [pettai, ticket #269] +
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Nov 27 11:42:02 UTC 2014 Modified Files: src/sys/dev/pci: if_wmvar.h Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/if_wmvar.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/pci/if_wmvar.h diff -u src/sys/dev/pci/if_wmvar.h:1.22 src/sys/dev/pci/if_wmvar.h:1.23 --- src/sys/dev/pci/if_wmvar.h:1.22 Tue Nov 25 05:05:16 2014 +++ src/sys/dev/pci/if_wmvar.h Thu Nov 27 11:42:02 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wmvar.h,v 1.22 2014/11/25 05:05:16 msaitoh Exp $ */ +/* $NetBSD: if_wmvar.h,v 1.23 2014/11/27 11:42:02 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -95,7 +95,7 @@ #define WM_F_HAS_MANAGE 0x0010 #define WM_F_WOL 0x0020 #define WM_F_EEE 0x0040 /* Energy Efficiency Ethernet */ -#define WM_F_ATTACHED 0x0080 /* attach() fininsed successfully */ +#define WM_F_ATTACHED 0x0080 /* attach() finished successfully */ /*
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: uebayasi
Date: Thu Nov 27 14:22:09 UTC 2014
Modified Files:
src/sys/arch/x86/x86: fpu.c pmap.c
Log Message:
Consistently use kpreempt_*() outside scheduler path.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/fpu.c
cvs rdiff -u -r1.185 -r1.186 src/sys/arch/x86/x86/pmap.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/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.9 src/sys/arch/x86/x86/fpu.c:1.10
--- src/sys/arch/x86/x86/fpu.c:1.9 Tue Feb 25 22:16:52 2014
+++ src/sys/arch/x86/x86/fpu.c Thu Nov 27 14:22:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.9 2014/02/25 22:16:52 dsl Exp $ */
+/* $NetBSD: fpu.c,v 1.10 2014/11/27 14:22:09 uebayasi Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc. All
@@ -100,7 +100,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.9 2014/02/25 22:16:52 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.10 2014/11/27 14:22:09 uebayasi Exp $);
#include opt_multiprocessor.h
@@ -408,7 +408,7 @@ fpudna(struct trapframe *frame)
/* Save our state if on a remote CPU. */
if (pcb-pcb_fpcpu != NULL) {
/* Explicitly disable preemption before dropping spl. */
- KPREEMPT_DISABLE(l);
+ kpreempt_disable();
splx(s);
/* Actually enable interrupts */
@@ -417,7 +417,7 @@ fpudna(struct trapframe *frame)
fpusave_lwp(l, true);
KASSERT(pcb-pcb_fpcpu == NULL);
s = splhigh();
- KPREEMPT_ENABLE(l);
+ kpreempt_enable();
}
/*
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.185 src/sys/arch/x86/x86/pmap.c:1.186
--- src/sys/arch/x86/x86/pmap.c:1.185 Sat Nov 22 06:45:08 2014
+++ src/sys/arch/x86/x86/pmap.c Thu Nov 27 14:22:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.185 2014/11/22 06:45:08 cherry Exp $ */
+/* $NetBSD: pmap.c,v 1.186 2014/11/27 14:22:09 uebayasi Exp $ */
/*-
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.185 2014/11/22 06:45:08 cherry Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.186 2014/11/27 14:22:09 uebayasi Exp $);
#include opt_user_ldt.h
#include opt_lockdebug.h
@@ -2915,7 +2915,7 @@ pmap_extract(struct pmap *pmap, vaddr_t
pa = 0;
l = curlwp;
- KPREEMPT_DISABLE(l);
+ kpreempt_disable();
ci = l-l_cpu;
if (__predict_true(!ci-ci_want_pmapload ci-ci_pmap == pmap) ||
pmap == pmap_kernel()) {
@@ -2948,7 +2948,7 @@ pmap_extract(struct pmap *pmap, vaddr_t
if (__predict_false(hard)) {
pmap_unmap_ptes(pmap, pmap2);
}
- KPREEMPT_ENABLE(l);
+ kpreempt_enable();
if (pap != NULL) {
*pap = pa;
}
@@ -4395,7 +4395,7 @@ pmap_update(struct pmap *pmap)
* If we have torn down this pmap, invalidate non-global TLB
* entries on any processors using it.
*/
- KPREEMPT_DISABLE(l);
+ kpreempt_disable();
if (__predict_false(l-l_md.md_gc_pmap == pmap)) {
l-l_md.md_gc_pmap = NULL;
pmap_tlb_shootdown(pmap, (vaddr_t)-1LL, 0, TLBSHOOT_UPDATE);
@@ -4405,7 +4405,7 @@ pmap_update(struct pmap *pmap)
* complete before returning control to the caller.
*/
pmap_tlb_shootnow();
- KPREEMPT_ENABLE(l);
+ kpreempt_enable();
/*
* Now that shootdowns are complete, process deferred frees,
CVS commit: src/sys/uvm
Module Name:src
Committed By: uebayasi
Date: Thu Nov 27 14:25:01 UTC 2014
Modified Files:
src/sys/uvm: uvm_emap.c uvm_glue.c
Log Message:
Consistently use kpreempt_*() outside scheduler path.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/uvm/uvm_emap.c
cvs rdiff -u -r1.160 -r1.161 src/sys/uvm/uvm_glue.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/uvm/uvm_emap.c
diff -u src/sys/uvm/uvm_emap.c:1.10 src/sys/uvm/uvm_emap.c:1.11
--- src/sys/uvm/uvm_emap.c:1.10 Sun Sep 15 15:51:23 2013
+++ src/sys/uvm/uvm_emap.c Thu Nov 27 14:25:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_emap.c,v 1.10 2013/09/15 15:51:23 martin Exp $ */
+/* $NetBSD: uvm_emap.c,v 1.11 2014/11/27 14:25:01 uebayasi Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_emap.c,v 1.10 2013/09/15 15:51:23 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_emap.c,v 1.11 2014/11/27 14:25:01 uebayasi Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -298,12 +298,12 @@ uvm_emap_consume(u_int gen)
* This test assumes two's complement arithmetic and allows
* ~2B missed updates before it will produce bad results.
*/
- KPREEMPT_DISABLE(l);
+ kpreempt_disable();
ci = l-l_cpu;
ucpu = ci-ci_data.cpu_uvm;
if (__predict_true((signed int)(ucpu-emap_gen - gen) = 0)) {
l-l_emap_gen = ucpu-emap_gen;
- KPREEMPT_ENABLE(l);
+ kpreempt_enable();
return;
}
@@ -329,7 +329,7 @@ uvm_emap_consume(u_int gen)
ucpu-emap_gen = curgen;
l-l_emap_gen = curgen;
KASSERT((signed int)(curgen - gen) = 0);
- KPREEMPT_ENABLE(l);
+ kpreempt_enable();
}
/*
Index: src/sys/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.160 src/sys/uvm/uvm_glue.c:1.161
--- src/sys/uvm/uvm_glue.c:1.160 Sat Sep 1 00:26:37 2012
+++ src/sys/uvm/uvm_glue.c Thu Nov 27 14:25:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_glue.c,v 1.160 2012/09/01 00:26:37 matt Exp $ */
+/* $NetBSD: uvm_glue.c,v 1.161 2014/11/27 14:25:01 uebayasi Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_glue.c,v 1.160 2012/09/01 00:26:37 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_glue.c,v 1.161 2014/11/27 14:25:01 uebayasi Exp $);
#include opt_kgdb.h
#include opt_kstack.h
@@ -431,11 +431,11 @@ uvm_proc_exit(struct proc *p)
/*
* borrow proc0's address space.
*/
- KPREEMPT_DISABLE(l);
+ kpreempt_disable();
pmap_deactivate(l);
p-p_vmspace = proc0.p_vmspace;
pmap_activate(l);
- KPREEMPT_ENABLE(l);
+ kpreempt_enable();
uvmspace_free(ovm);
}
CVS commit: src/sys/kern
Module Name:src Committed By: uebayasi Date: Thu Nov 27 14:38:09 UTC 2014 Modified Files: src/sys/kern: init_main.c Log Message: Yield the main thread only after exiting critical section. To generate a diff of this commit: cvs rdiff -u -r1.460 -r1.461 src/sys/kern/init_main.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/kern/init_main.c diff -u src/sys/kern/init_main.c:1.460 src/sys/kern/init_main.c:1.461 --- src/sys/kern/init_main.c:1.460 Sat Oct 4 11:15:44 2014 +++ src/sys/kern/init_main.c Thu Nov 27 14:38:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: init_main.c,v 1.460 2014/10/04 11:15:44 riastradh Exp $ */ +/* $NetBSD: init_main.c,v 1.461 2014/11/27 14:38:09 uebayasi Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.460 2014/10/04 11:15:44 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.461 2014/11/27 14:38:09 uebayasi Exp $); #include opt_ddb.h #include opt_ipsec.h @@ -528,6 +528,9 @@ main(void) /* Now timer is working. Enable preemption. */ kpreempt_enable(); + /* Get the threads going and into any sleeps before continuing. */ + yield(); + /* Enable deferred processing of RNG samples */ rnd_init_softint(); @@ -803,9 +806,6 @@ configure2(void) * devices that want interrupts enabled. */ config_create_interruptthreads(); - - /* Get the threads going and into any sleeps before continuing. */ - yield(); } static void
CVS commit: src/sys/kern
Module Name:src
Committed By: uebayasi
Date: Thu Nov 27 15:00:01 UTC 2014
Modified Files:
src/sys/kern: subr_percpu.c
Log Message:
Consistently use kpreempt_*() outside scheduler path.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/kern/subr_percpu.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/kern/subr_percpu.c
diff -u src/sys/kern/subr_percpu.c:1.16 src/sys/kern/subr_percpu.c:1.17
--- src/sys/kern/subr_percpu.c:1.16 Fri Jan 27 19:48:40 2012
+++ src/sys/kern/subr_percpu.c Thu Nov 27 15:00:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_percpu.c,v 1.16 2012/01/27 19:48:40 para Exp $ */
+/* $NetBSD: subr_percpu.c,v 1.17 2014/11/27 15:00:00 uebayasi Exp $ */
/*-
* Copyright (c)2007,2008 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_percpu.c,v 1.16 2012/01/27 19:48:40 para Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_percpu.c,v 1.17 2014/11/27 15:00:00 uebayasi Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -291,7 +291,7 @@ void *
percpu_getref(percpu_t *pc)
{
- KPREEMPT_DISABLE(curlwp);
+ kpreempt_disable();
return percpu_getptr_remote(pc, curcpu());
}
@@ -306,7 +306,7 @@ void
percpu_putref(percpu_t *pc)
{
- KPREEMPT_ENABLE(curlwp);
+ kpreempt_enable();
}
/*
CVS commit: src/usr.bin/patch
Module Name:src Committed By: christos Date: Thu Nov 27 15:07:23 UTC 2014 Modified Files: src/usr.bin/patch: pch.c Log Message: PR/49422: Ryo ONODERA: patch(1) cannot handle context diffs To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.bin/patch/pch.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/patch/pch.c diff -u src/usr.bin/patch/pch.c:1.26 src/usr.bin/patch/pch.c:1.27 --- src/usr.bin/patch/pch.c:1.26 Tue Nov 25 19:31:32 2014 +++ src/usr.bin/patch/pch.c Thu Nov 27 10:07:23 2014 @@ -1,7 +1,7 @@ /* * $OpenBSD: pch.c,v 1.37 2007/09/02 15:19:33 deraadt Exp $ * $DragonFly: src/usr.bin/patch/pch.c,v 1.6 2008/08/10 23:35:40 joerg Exp $ - * $NetBSD: pch.c,v 1.26 2014/11/26 00:31:32 christos Exp $ + * $NetBSD: pch.c,v 1.27 2014/11/27 15:07:23 christos Exp $ */ /* @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: pch.c,v 1.26 2014/11/26 00:31:32 christos Exp $); +__RCSID($NetBSD: pch.c,v 1.27 2014/11/27 15:07:23 christos Exp $); #include sys/types.h #include sys/stat.h @@ -619,8 +619,8 @@ another_hunk(void) p_ptrn_lines = 0; p_first = 1; } -if (p_first = LINENUM_MAX - p_ptrn_lines || -p_ptrn_lines = LINENUM_MAX - 6) +if (p_first = LINENUM_MAX - p_ptrn_lines || +p_ptrn_lines = LINENUM_MAX - 6) malformed(); /* we need this much at least */
CVS commit: src/sys/arch
Module Name:src
Committed By: bouyer
Date: Thu Nov 27 16:29:44 UTC 2014
Modified Files:
src/sys/arch/x86/x86: pmap.c
src/sys/arch/xen/x86: cpu.c
Log Message:
Revert sys/arch/x86/x86/pmap.c 1.185; a CPU needs to get pmap updates,
especially for pmap_kernel(), as soon as it is up.
Instead move all pmap-related cpu_info initialisations, including
initializing ci_kpm_mtx, in cpu_attach_common() from cpu_init()
(ci_pmap and ci_tlbstate as already initialized in cpu_attach_common()).
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/xen/x86/cpu.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/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.186 src/sys/arch/x86/x86/pmap.c:1.187
--- src/sys/arch/x86/x86/pmap.c:1.186 Thu Nov 27 14:22:09 2014
+++ src/sys/arch/x86/x86/pmap.c Thu Nov 27 16:29:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.186 2014/11/27 14:22:09 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.187 2014/11/27 16:29:44 bouyer Exp $ */
/*-
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.186 2014/11/27 14:22:09 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.187 2014/11/27 16:29:44 bouyer Exp $);
#include opt_user_ldt.h
#include opt_lockdebug.h
@@ -4187,7 +4187,8 @@ pmap_alloc_level(pd_entry_t * const *pde
pmap_pte_set(pdep[i], pte);
#if defined(PAE) || defined(__x86_64__)
if (level == PTP_LEVELS i = PDIR_SLOT_KERN) {
- if (__predict_true(mp_online == true)) {
+if (__predict_true(
+cpu_info_primary.ci_flags CPUF_PRESENT)) {
/* update per-cpu PMDs on all cpus */
xen_kpm_sync(pmap_kernel(), i);
} else {
Index: src/sys/arch/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.99 src/sys/arch/xen/x86/cpu.c:1.100
--- src/sys/arch/xen/x86/cpu.c:1.99 Sat Oct 18 08:33:27 2014
+++ src/sys/arch/xen/x86/cpu.c Thu Nov 27 16:29:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.99 2014/10/18 08:33:27 snj Exp $ */
+/* $NetBSD: cpu.c,v 1.100 2014/11/27 16:29:44 bouyer Exp $ */
/* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.99 2014/10/18 08:33:27 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.100 2014/11/27 16:29:44 bouyer Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -425,6 +425,13 @@ cpu_attach_common(device_t parent, devic
}
KASSERT(ci-ci_cpuid == ci-ci_index);
+#ifdef __x86_64__
+ /* No user PGD mapped for this CPU yet */
+ ci-ci_xen_current_user_pgd = 0;
+#endif
+#if defined(__x86_64__) || defined(PAE)
+ mutex_init(ci-ci_kpm_mtx, MUTEX_DEFAULT, IPL_VM);
+#endif
pmap_reference(pmap_kernel());
ci-ci_pmap = pmap_kernel();
ci-ci_tlbstate = TLBSTATE_STALE;
@@ -543,14 +550,6 @@ cpu_init(struct cpu_info *ci)
lcr4(rcr4() | CR4_OSXMMEXCPT);
}
-#ifdef __x86_64__
- /* No user PGD mapped for this CPU yet */
- ci-ci_xen_current_user_pgd = 0;
-#endif
-#if defined(__x86_64__) || defined(PAE)
- mutex_init(ci-ci_kpm_mtx, MUTEX_DEFAULT, IPL_VM);
-#endif
-
atomic_or_32(ci-ci_flags, CPUF_RUNNING);
}
CVS commit: src/sbin/ping
Module Name:src
Committed By: christos
Date: Thu Nov 27 19:43:58 UTC 2014
Modified Files:
src/sbin/ping: ping.c
Log Message:
PR/49423: Martin Husemann: ping for small packets does not work in -7 or
-current
XXX: pullup 7?
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sbin/ping/ping.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/ping/ping.c
diff -u src/sbin/ping/ping.c:1.107 src/sbin/ping/ping.c:1.108
--- src/sbin/ping/ping.c:1.107 Fri Oct 18 21:08:25 2013
+++ src/sbin/ping/ping.c Thu Nov 27 14:43:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ping.c,v 1.107 2013/10/19 01:08:25 christos Exp $ */
+/* $NetBSD: ping.c,v 1.108 2014/11/27 19:43:58 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: ping.c,v 1.107 2013/10/19 01:08:25 christos Exp $);
+__RCSID($NetBSD: ping.c,v 1.108 2014/11/27 19:43:58 christos Exp $);
#endif
#include stdio.h
@@ -469,7 +469,6 @@ main(int argc, char *argv[])
phdrlen = 0;
packlen = datalen + 60 + 76; /* MAXIP + MAXICMP */
- datalen -= phdrlen;
if ((packet = malloc(packlen)) == NULL)
err(1, Out of memory);
@@ -637,7 +636,7 @@ main(int argc, char *argv[])
#endif /*IPSEC*/
(void)printf(PING %s (%s): %d data bytes\n, hostname,
- inet_ntoa(whereto.sin_addr), datalen + phdrlen);
+ inet_ntoa(whereto.sin_addr), datalen);
/* When pinging the broadcast address, you can get a lot
* of answers. Doing something so evil is useful if you
@@ -887,7 +886,7 @@ pinger(void)
} else if (pingflags F_TIMING64)
(void) memcpy(opack_icmp.icmp_data[0], now, sizeof(now));
- cc = MAX(datalen, ICMP_MINLEN) + phdrlen;
+ cc = MAX(datalen, ICMP_MINLEN) + PHDR_LEN;
opack_icmp.icmp_cksum = 0;
opack_icmp.icmp_cksum = in_cksum((u_int16_t *)opack_icmp, cc);
@@ -1115,7 +1114,7 @@ pr_pack(u_char *buf,
}
PR_PACK_SUB();
(void)printf(\nwrong data byte #%d should have been
- %#x but was %#x, i,
+ %#x but was %#x, i - phdrlen,
(u_char)opack_icmp.icmp_data[i],
(u_char)icp-icmp_data[i]);
for (i = phdrlen; i datalen; i++) {
@@ -1350,7 +1349,7 @@ summary(int header)
if (n1)
variance = (tsumsq - n*avg*avg) /(n-1);
- printf(round-trip min/avg/max/stddev =
+ (void)printf(round-trip min/avg/max/stddev =
%.*f/%.*f/%.*f/%.*f ms\n,
prec, tmin * 1000.0,
prec, avg * 1000.0,
@@ -1810,7 +1809,7 @@ fill(void)
pat[8], pat[9], pat[10], pat[11],
pat[12], pat[13], pat[14], pat[15]);
- for (k = phdrlen, j = 0; k = datalen; k++) {
+ for (k = phdrlen, j = 0; k datalen; k++) {
opack_icmp.icmp_data[k] = pat[j];
if (++j = i)
j = 0;
CVS commit: src/external/bsd/nvi/dist/ex
Module Name:src
Committed By: christos
Date: Thu Nov 27 20:00:10 UTC 2014
Modified Files:
src/external/bsd/nvi/dist/ex: ex_mkexrc.c
Log Message:
exrc expects 1 argument.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/ex/ex_mkexrc.c
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/nvi/dist/ex/ex_mkexrc.c
diff -u src/external/bsd/nvi/dist/ex/ex_mkexrc.c:1.3 src/external/bsd/nvi/dist/ex/ex_mkexrc.c:1.4
--- src/external/bsd/nvi/dist/ex/ex_mkexrc.c:1.3 Sun Jan 26 16:43:45 2014
+++ src/external/bsd/nvi/dist/ex/ex_mkexrc.c Thu Nov 27 15:00:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_mkexrc.c,v 1.3 2014/01/26 21:43:45 christos Exp $ */
+/* $NetBSD: ex_mkexrc.c,v 1.4 2014/11/27 20:00:09 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -16,7 +16,7 @@
static const char sccsid[] = Id: ex_mkexrc.c,v 10.13 2001/06/25 15:19:17 skimo Exp (Berkeley) Date: 2001/06/25 15:19:17 ;
#endif /* not lint */
#else
-__RCSID($NetBSD: ex_mkexrc.c,v 1.3 2014/01/26 21:43:45 christos Exp $);
+__RCSID($NetBSD: ex_mkexrc.c,v 1.4 2014/11/27 20:00:09 christos Exp $);
#endif
#include sys/types.h
@@ -52,7 +52,7 @@ ex_mkexrc(SCR *sp, EXCMD *cmdp)
size_t flen;
switch (cmdp-argc) {
- case 0:
+ case 1:
fname = _PATH_EXRC;
INT2CHAR(sp, cmdp-argv[0]-bp, cmdp-argv[0]-len + 1,
fname, flen);
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: christos
Date: Thu Nov 27 20:30:21 UTC 2014
Modified Files:
src/sys/opencrypto: cryptosoft_xform.c
Log Message:
simplify, no functional change
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/opencrypto/cryptosoft_xform.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/opencrypto/cryptosoft_xform.c
diff -u src/sys/opencrypto/cryptosoft_xform.c:1.26 src/sys/opencrypto/cryptosoft_xform.c:1.27
--- src/sys/opencrypto/cryptosoft_xform.c:1.26 Sat Feb 2 16:06:31 2013
+++ src/sys/opencrypto/cryptosoft_xform.c Thu Nov 27 15:30:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptosoft_xform.c,v 1.26 2013/02/02 21:06:31 christos Exp $ */
+/* $NetBSD: cryptosoft_xform.c,v 1.27 2014/11/27 20:30:21 christos Exp $ */
/* $FreeBSD: src/sys/opencrypto/xform.c,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: xform.c,v 1.19 2002/08/16 22:47:25 dhartmei Exp $ */
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: cryptosoft_xform.c,v 1.26 2013/02/02 21:06:31 christos Exp $);
+__KERNEL_RCSID(1, $NetBSD: cryptosoft_xform.c,v 1.27 2014/11/27 20:30:21 christos Exp $);
#include crypto/blowfish/blowfish.h
#include crypto/cast128/cast128.h
@@ -427,17 +427,14 @@ static int
des1_setkey(u_int8_t **sched, const u_int8_t *key, int len)
{
des_key_schedule *p;
- int err;
p = malloc(sizeof (des_key_schedule),
- M_CRYPTO_DATA, M_NOWAIT|M_ZERO);
- if (p != NULL) {
- des_set_key((des_cblock *)__UNCONST(key), p[0]);
- err = 0;
- } else
- err = ENOMEM;
+ M_CRYPTO_DATA, M_NOWAIT|M_ZERO);
*sched = (u_int8_t *) p;
- return err;
+ if (p == NULL)
+ return ENOMEM;
+ des_set_key((des_cblock *)__UNCONST(key), p[0]);
+ return 0;
}
static void
@@ -470,19 +467,16 @@ static int
des3_setkey(u_int8_t **sched, const u_int8_t *key, int len)
{
des_key_schedule *p;
- int err;
p = malloc(3*sizeof (des_key_schedule),
M_CRYPTO_DATA, M_NOWAIT|M_ZERO);
- if (p != NULL) {
- des_set_key((des_cblock *)__UNCONST(key + 0), p[0]);
- des_set_key((des_cblock *)__UNCONST(key + 8), p[1]);
- des_set_key((des_cblock *)__UNCONST(key + 16), p[2]);
- err = 0;
- } else
- err = ENOMEM;
*sched = (u_int8_t *) p;
- return err;
+ if (p == NULL)
+ return ENOMEM;
+ des_set_key((des_cblock *)__UNCONST(key + 0), p[0]);
+ des_set_key((des_cblock *)__UNCONST(key + 8), p[1]);
+ des_set_key((des_cblock *)__UNCONST(key + 16), p[2]);
+ return 0;
}
static void
@@ -510,16 +504,13 @@ blf_decrypt(void *key, u_int8_t *blk)
static int
blf_setkey(u_int8_t **sched, const u_int8_t *key, int len)
{
- int err;
*sched = malloc(sizeof(BF_KEY),
M_CRYPTO_DATA, M_NOWAIT|M_ZERO);
- if (*sched != NULL) {
- BF_set_key((BF_KEY *) *sched, len, key);
- err = 0;
- } else
- err = ENOMEM;
- return err;
+ if (*sched == NULL)
+ return ENOMEM;
+ BF_set_key((BF_KEY *) *sched, len, key);
+ return 0;
}
static void
@@ -545,16 +536,13 @@ cast5_decrypt(void *key, u_int8_t *blk)
static int
cast5_setkey(u_int8_t **sched, const u_int8_t *key, int len)
{
- int err;
*sched = malloc(sizeof(cast128_key), M_CRYPTO_DATA,
M_NOWAIT|M_ZERO);
- if (*sched != NULL) {
- cast128_setkey((cast128_key *)*sched, key, len);
- err = 0;
- } else
- err = ENOMEM;
- return err;
+ if (*sched == NULL)
+ return ENOMEM;
+ cast128_setkey((cast128_key *)*sched, key, len);
+ return 0;
}
static void
@@ -580,7 +568,6 @@ skipjack_decrypt(void *key, u_int8_t *bl
static int
skipjack_setkey(u_int8_t **sched, const u_int8_t *key, int len)
{
- int err;
/* NB: allocate all the memory that's needed at once */
/* XXX assumes bytes are aligned on sizeof(u_char) == 1 boundaries.
@@ -589,21 +576,19 @@ skipjack_setkey(u_int8_t **sched, const
*sched = malloc(10 * (sizeof(u_int8_t *) + 0x100),
M_CRYPTO_DATA, M_NOWAIT|M_ZERO);
- if (*sched != NULL) {
+ if (*sched == NULL)
+ return ENOMEM;
- u_int8_t** key_tables = (u_int8_t**) *sched;
- u_int8_t* table = (u_int8_t*) key_tables[10];
- int k;
-
- for (k = 0; k 10; k++) {
- key_tables[k] = table;
- table += 0x100;
- }
- subkey_table_gen(key, (u_int8_t **) *sched);
- err = 0;
- } else
- err = ENOMEM;
- return err;
+ u_int8_t** key_tables = (u_int8_t**) *sched;
+ u_int8_t* table = (u_int8_t*) key_tables[10];
+ int k;
+
+ for (k = 0; k 10; k++) {
+ key_tables[k] = table;
+ table += 0x100;
+ }
+ subkey_table_gen(key, (u_int8_t **) *sched);
+ return 0;
}
static void
@@ -630,18 +615,15 @@ rijndael128_decrypt(void *key, u_int8_t
static int
rijndael128_setkey(u_int8_t **sched, const u_int8_t *key, int len)
{
- int err;
if (len != 16 len != 24 len != 32)
return EINVAL;
*sched = malloc(sizeof(rijndael_ctx), M_CRYPTO_DATA,
M_NOWAIT|M_ZERO);
- if (*sched != NULL) {
- rijndael_set_key((rijndael_ctx *) *sched, key, len * 8);
- err = 0;
- } else
- err = ENOMEM;
- return err;
+ if (*sched ==
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: christos
Date: Thu Nov 27 20:30:05 UTC 2014
Modified Files:
src/sys/opencrypto: cryptodev.c
Log Message:
Return ENOSPC instead of ENOMEM when there is no room in the buffer to
store results. ENOMEM in this subsystem means we cannot allocate more
requests or internal buffers for xforms.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/opencrypto/cryptodev.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/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.81 src/sys/opencrypto/cryptodev.c:1.82
--- src/sys/opencrypto/cryptodev.c:1.81 Fri Sep 5 05:23:40 2014
+++ src/sys/opencrypto/cryptodev.c Thu Nov 27 15:30:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.81 2014/09/05 09:23:40 matt Exp $ */
+/* $NetBSD: cryptodev.c,v 1.82 2014/11/27 20:30:05 christos Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.81 2014/09/05 09:23:40 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.82 2014/11/27 20:30:05 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -695,7 +695,7 @@ eagain:
/* let the user know how much data was returned */
if (crp-crp_olen) {
if (crp-crp_olen (cop-dst_len ? cop-dst_len : cop-len)) {
- error = ENOMEM;
+ error = ENOSPC;
goto bail;
}
dst_len = cop-dst_len = crp-crp_olen;
