From da9f046f19409cb2f1bf1505943502cb51afc035 Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Mon, 29 Sep 2014 14:00:46 -0700 Subject: [PATCH] Update license and copyright text to conform to LBNL standards. Note that the license remains a 3-clause BSD license; the only license changes were to add the name of the program and to add some punctuation. --- LICENSE | 4 ++-- README.md | 28 ++++++++++++++++++++++++++++ bootstrap.sh | 25 +++++++++++++++++++++---- configure.ac | 25 +++++++++++++++++++++++++ src/flowlabel.h | 32 +++++++++++++++++++++++++------- src/iperf.h | 29 +++++++++++++++++++++++------ src/iperf_api.c | 25 +++++++++++++++++++++---- src/iperf_api.h | 29 +++++++++++++++++++++++------ src/iperf_client_api.c | 29 +++++++++++++++++++++++------ src/iperf_error.c | 29 +++++++++++++++++++++++------ src/iperf_locale.c | 27 ++++++++++++++++++++++++--- src/iperf_locale.h | 29 +++++++++++++++++++++++------ src/iperf_sctp.c | 28 +++++++++++++++++++++++----- src/iperf_sctp.h | 29 +++++++++++++++++++++++------ src/iperf_server_api.c | 29 +++++++++++++++++++++++------ src/iperf_tcp.c | 28 +++++++++++++++++++++++----- src/iperf_tcp.h | 29 +++++++++++++++++++++++------ src/iperf_udp.c | 29 +++++++++++++++++++++++------ src/iperf_udp.h | 29 +++++++++++++++++++++++------ src/iperf_util.c | 29 +++++++++++++++++++++++------ src/iperf_util.h | 29 +++++++++++++++++++++++------ src/main.c | 28 +++++++++++++++++++++++----- src/net.c | 28 +++++++++++++++++++++++----- src/net.h | 29 +++++++++++++++++++++++------ src/t_timer.c | 29 +++++++++++++++++++++++------ src/t_units.c | 29 +++++++++++++++++++++++------ src/t_uuid.c | 29 +++++++++++++++++++++++------ src/tcp_info.c | 28 +++++++++++++++++++++++----- src/tcp_window_size.h | 29 +++++++++++++++++++++++------ src/timer.c | 28 +++++++++++++++++++++++----- src/timer.h | 28 +++++++++++++++++++++++----- src/units.h | 29 +++++++++++++++++++++++------ src/version.h.in | 29 +++++++++++++++++++++++------ 33 files changed, 744 insertions(+), 169 deletions(-) diff --git a/LICENSE b/LICENSE index e5fc4c8..8bd6b51 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ -Copyright (c) 2009-2014, The Regents of the University of California, through +"iperf, Copyright (c) 2014, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required -approvals from the U.S. Dept. of Energy). All rights reserved. +approvals from the U.S. Dept. of Energy). All rights reserved." Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 0886287..27d4e60 100644 --- a/README.md +++ b/README.md @@ -169,3 +169,31 @@ responsibility for the content of these pages. ): http://cheatsheet.logicalwebhost.com/iperf-network-testing/ + +Copyright +--------- + +iperf, Copyright (c) 2014, The Regents of the University of +California, through Lawrence Berkeley National Laboratory (subject +to receipt of any required approvals from the U.S. Dept. of +Energy). All rights reserved. + +If you have questions about your rights to use or distribute this +software, please contact Berkeley Lab's Technology Transfer +Department at TTD@lbl.gov. + +NOTICE. This software is owned by the U.S. Department of Energy. +As such, the U.S. Government has been granted for itself and others +acting on its behalf a paid-up, nonexclusive, irrevocable, +worldwide license in the Software to reproduce, prepare derivative +works, and perform publicly and display publicly. Beginning five +(5) years after the date permission to assert copyright is obtained +from the U.S. Department of Energy, and subject to any subsequent +five (5) year renewals, the U.S. Government is granted for itself +and others acting on its behalf a paid-up, nonexclusive, +irrevocable, worldwide license in the Software to reproduce, +prepare derivative works, distribute copies to the public, perform +publicly and display publicly, and to permit others to do so. + +This code is distributed under a BSD style license, see the LICENSE +file for complete information. diff --git a/bootstrap.sh b/bootstrap.sh index c59ad2d..73511fb 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,9 +1,26 @@ #! /bin/sh # -# Copyright (c) 2014, The Regents of the University of California, -# through Lawrence Berkeley National Laboratory (subject to receipt of -# any required approvals from the U.S. Dept. of Energy). All rights -# reserved. +# iperf, Copyright (c) 2014, The Regents of the University of +# California, through Lawrence Berkeley National Laboratory (subject +# to receipt of any required approvals from the U.S. Dept. of +# Energy). All rights reserved. +# +# If you have questions about your rights to use or distribute this +# software, please contact Berkeley Lab's Technology Transfer +# Department at TTD@lbl.gov. +# +# NOTICE. This software is owned by the U.S. Department of Energy. +# As such, the U.S. Government has been granted for itself and others +# acting on its behalf a paid-up, nonexclusive, irrevocable, +# worldwide license in the Software to reproduce, prepare derivative +# works, and perform publicly and display publicly. Beginning five +# (5) years after the date permission to assert copyright is obtained +# from the U.S. Department of Energy, and subject to any subsequent +# five (5) year renewals, the U.S. Government is granted for itself +# and others acting on its behalf a paid-up, nonexclusive, +# irrevocable, worldwide license in the Software to reproduce, +# prepare derivative works, distribute copies to the public, perform +# publicly and display publicly, and to permit others to do so. # # This code is distributed under a BSD style license, see the LICENSE # file for complete information. diff --git a/configure.ac b/configure.ac index 4650755..3f7f413 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,28 @@ +# iperf, Copyright (c) 2014, The Regents of the University of +# California, through Lawrence Berkeley National Laboratory (subject +# to receipt of any required approvals from the U.S. Dept. of +# Energy). All rights reserved. +# +# If you have questions about your rights to use or distribute this +# software, please contact Berkeley Lab's Technology Transfer +# Department at TTD@lbl.gov. +# +# NOTICE. This software is owned by the U.S. Department of Energy. +# As such, the U.S. Government has been granted for itself and others +# acting on its behalf a paid-up, nonexclusive, irrevocable, +# worldwide license in the Software to reproduce, prepare derivative +# works, and perform publicly and display publicly. Beginning five +# (5) years after the date permission to assert copyright is obtained +# from the U.S. Department of Energy, and subject to any subsequent +# five (5) year renewals, the U.S. Government is granted for itself +# and others acting on its behalf a paid-up, nonexclusive, +# irrevocable, worldwide license in the Software to reproduce, +# prepare derivative works, distribute copies to the public, perform +# publicly and display publicly, and to permit others to do so. +# +# This code is distributed under a BSD style license, see the LICENSE +# file for complete information. + # Initialize the autoconf system for the specified tool, version and mailing list AC_INIT(iperf, 3-CURRENT, https://github.com/esnet/iperf, iperf, http://software.es.net/iperf/) diff --git a/src/flowlabel.h b/src/flowlabel.h index b24e904..1d5e013 100644 --- a/src/flowlabel.h +++ b/src/flowlabel.h @@ -1,11 +1,29 @@ -/* - * Copyright (c) 2009-2011, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. +/* + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. + * + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #ifndef __FLOW_LABEL_H #define __FLOW_LABEL_H diff --git a/src/iperf.h b/src/iperf.h index 4cfab50..6b55559 100644 --- a/src/iperf.h +++ b/src/iperf.h @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #ifndef __IPERF_H #define __IPERF_H diff --git a/src/iperf_api.c b/src/iperf_api.c index 1ecc2f3..d9b3983 100644 --- a/src/iperf_api.c +++ b/src/iperf_api.c @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. + * + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. * * This code is distributed under a BSD style license, see the LICENSE file * for complete information. */ - #define _GNU_SOURCE #define __USE_GNU diff --git a/src/iperf_api.h b/src/iperf_api.h index a31a16b..368f498 100644 --- a/src/iperf_api.h +++ b/src/iperf_api.h @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #ifndef __IPERF_API_H #define __IPERF_API_H diff --git a/src/iperf_client_api.c b/src/iperf_client_api.c index 707a466..865faa1 100644 --- a/src/iperf_client_api.c +++ b/src/iperf_client_api.c @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #include #include #include diff --git a/src/iperf_error.c b/src/iperf_error.c index 6dd1dc1..a14f261 100644 --- a/src/iperf_error.c +++ b/src/iperf_error.c @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #include #include #include diff --git a/src/iperf_locale.c b/src/iperf_locale.c index b3b801b..91bacc4 100644 --- a/src/iperf_locale.c +++ b/src/iperf_locale.c @@ -1,7 +1,28 @@ /*--------------------------------------------------------------- - * Copyright (c) 2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. + * + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. * * Based on code that is: * diff --git a/src/iperf_locale.h b/src/iperf_locale.h index 35606be..4bfd99b 100644 --- a/src/iperf_locale.h +++ b/src/iperf_locale.h @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #ifndef IPERF_LOCALE_H #define IPERF_LOCALE_H diff --git a/src/iperf_sctp.c b/src/iperf_sctp.c index 1de74fc..eb30f5c 100644 --- a/src/iperf_sctp.c +++ b/src/iperf_sctp.c @@ -1,10 +1,28 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ #include "iperf_config.h" diff --git a/src/iperf_sctp.h b/src/iperf_sctp.h index 3e624c6..b3f4fc4 100644 --- a/src/iperf_sctp.h +++ b/src/iperf_sctp.h @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #ifndef IPERF_SCTP_H #define IPERF_SCTP_H diff --git a/src/iperf_server_api.c b/src/iperf_server_api.c index c698904..31b642e 100644 --- a/src/iperf_server_api.c +++ b/src/iperf_server_api.c @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - /* iperf_server_api.c: Functions to be used by an iperf server */ diff --git a/src/iperf_tcp.c b/src/iperf_tcp.c index 0324e44..78501fe 100644 --- a/src/iperf_tcp.c +++ b/src/iperf_tcp.c @@ -1,10 +1,28 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ #include "iperf_config.h" diff --git a/src/iperf_tcp.h b/src/iperf_tcp.h index ef915de..d53b052 100644 --- a/src/iperf_tcp.h +++ b/src/iperf_tcp.h @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2011, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #ifndef IPERF_TCP_H #define IPERF_TCP_H diff --git a/src/iperf_udp.c b/src/iperf_udp.c index c803e98..edc1721 100644 --- a/src/iperf_udp.c +++ b/src/iperf_udp.c @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2011, 2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #include #include #include diff --git a/src/iperf_udp.h b/src/iperf_udp.h index 57a0eb0..c6f15ab 100644 --- a/src/iperf_udp.h +++ b/src/iperf_udp.h @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2011, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #ifndef __IPERF_UDP_H #define __IPERF_UDP_H diff --git a/src/iperf_util.c b/src/iperf_util.c index 01c0dd0..8413200 100644 --- a/src/iperf_util.c +++ b/src/iperf_util.c @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - /* iperf_util.c * * Iperf utility functions diff --git a/src/iperf_util.h b/src/iperf_util.h index fe58e8c..e422a11 100644 --- a/src/iperf_util.h +++ b/src/iperf_util.h @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2011, 2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #ifndef __IPERF_UTIL_H #define __IPERF_UTIL_H diff --git a/src/main.c b/src/main.c index 7205cc1..7879557 100644 --- a/src/main.c +++ b/src/main.c @@ -1,10 +1,28 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ #include "iperf_config.h" diff --git a/src/net.c b/src/net.c index 1fb4094..cc5a7c1 100644 --- a/src/net.c +++ b/src/net.c @@ -1,10 +1,28 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ #include "iperf_config.h" diff --git a/src/net.h b/src/net.h index 5ab10ec..543365c 100644 --- a/src/net.h +++ b/src/net.h @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #ifndef __NET_H #define __NET_H diff --git a/src/t_timer.c b/src/t_timer.c index ce6fe69..c9018e6 100644 --- a/src/t_timer.c +++ b/src/t_timer.c @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2011, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #include #include #include diff --git a/src/t_units.c b/src/t_units.c index 5a8ee68..3fe8c4e 100644 --- a/src/t_units.c +++ b/src/t_units.c @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2011, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #include #ifdef HAVE_STDINT_H #include diff --git a/src/t_uuid.c b/src/t_uuid.c index 79abf1e..49064e1 100644 --- a/src/t_uuid.c +++ b/src/t_uuid.c @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2011, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #include #include #include diff --git a/src/tcp_info.c b/src/tcp_info.c index 5893904..cd3154c 100644 --- a/src/tcp_info.c +++ b/src/tcp_info.c @@ -1,10 +1,28 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ /* diff --git a/src/tcp_window_size.h b/src/tcp_window_size.h index c4852b3..22fb9fb 100644 --- a/src/tcp_window_size.h +++ b/src/tcp_window_size.h @@ -1,11 +1,28 @@ /* - * Copyright (c) 2009-2011, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - int set_tcp_windowsize(int sock, int bufsize, int dir); int get_tcp_windowsize(int sock, int dir); diff --git a/src/timer.c b/src/timer.c index 4552571..bfc52e4 100644 --- a/src/timer.c +++ b/src/timer.c @@ -1,10 +1,28 @@ /* - * Copyright (c) 2009-2011, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. * * Based on timers.c by Jef Poskanzer. Used with permission. */ diff --git a/src/timer.h b/src/timer.h index 8b767eb..0f9c5eb 100644 --- a/src/timer.h +++ b/src/timer.h @@ -1,10 +1,28 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. * * Based on timers.h by Jef Poskanzer. Used with permission. */ diff --git a/src/units.h b/src/units.h index ce99594..6ab9216 100644 --- a/src/units.h +++ b/src/units.h @@ -1,12 +1,29 @@ /* - * Copyright (c) 2009-2011, 2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - enum { UNIT_LEN = 32 }; diff --git a/src/version.h.in b/src/version.h.in index 5491a27..627ef97 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1,10 +1,27 @@ /* - * Copyright (c) 2009-2014, The Regents of the University of California, - * through Lawrence Berkeley National Laboratory (subject to receipt of any - * required approvals from the U.S. Dept. of Energy). All rights reserved. + * iperf, Copyright (c) 2014, The Regents of the University of + * California, through Lawrence Berkeley National Laboratory (subject + * to receipt of any required approvals from the U.S. Dept. of + * Energy). All rights reserved. * - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. + * If you have questions about your rights to use or distribute this + * software, please contact Berkeley Lab's Technology Transfer + * Department at TTD@lbl.gov. + * + * NOTICE. This software is owned by the U.S. Department of Energy. + * As such, the U.S. Government has been granted for itself and others + * acting on its behalf a paid-up, nonexclusive, irrevocable, + * worldwide license in the Software to reproduce, prepare derivative + * works, and perform publicly and display publicly. Beginning five + * (5) years after the date permission to assert copyright is obtained + * from the U.S. Department of Energy, and subject to any subsequent + * five (5) year renewals, the U.S. Government is granted for itself + * and others acting on its behalf a paid-up, nonexclusive, + * irrevocable, worldwide license in the Software to reproduce, + * prepare derivative works, distribute copies to the public, perform + * publicly and display publicly, and to permit others to do so. + * + * This code is distributed under a BSD style license, see the LICENSE + * file for complete information. */ - #define IPERF_VERSION "@PACKAGE_VERSION@"