diff --git a/src/network/utils/error-model.cc b/src/network/utils/error-model.cc index 70ff7b938..f9f0ddaa8 100644 --- a/src/network/utils/error-model.cc +++ b/src/network/utils/error-model.cc @@ -15,7 +15,40 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Tom Henderson + * + * This file incorporates work covered by the following copyright and + * permission notice: + * + * Copyright (c) 1997 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor of the Laboratory may be used + * to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Contributed by the Daedalus Research Group, UC Berkeley + * (http://daedalus.cs.berkeley.edu) + * * This code has been ported from ns-2 (queue/errmodel.{cc,h} */ diff --git a/src/network/utils/error-model.h b/src/network/utils/error-model.h index 98ff49fce..b81f5fb81 100644 --- a/src/network/utils/error-model.h +++ b/src/network/utils/error-model.h @@ -15,9 +15,43 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Tom Henderson + * + * This file incorporates work covered by the following copyright and + * permission notice: + * + * Copyright (c) 1997 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor of the Laboratory may be used + * to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Contributed by the Daedalus Research Group, UC Berkeley + * (http://daedalus.cs.berkeley.edu) + * * This code has been ported from ns-2 (queue/errmodel.{cc,h} */ + #ifndef ERROR_MODEL_H #define ERROR_MODEL_H diff --git a/src/network/utils/red-queue.cc b/src/network/utils/red-queue.cc index a203bd1eb..6bcc093fd 100644 --- a/src/network/utils/red-queue.cc +++ b/src/network/utils/red-queue.cc @@ -1,6 +1,27 @@ /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* - * This code was ported from ns-2 (queue/red.cc), with license: + * Copyright © 2011 Marcos Talau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Marcos Talau (talau@users.sourceforge.net) + * + * Thanks to: Duy Nguyen by RED efforts in NS3 + * + * + * This file incorporates work covered by the following copyright and + * permission notice: * * Copyright (c) 1990-1997 Regents of the University of California. * All rights reserved. @@ -28,33 +49,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * - * This port: - * - * Copyright © 2011 Marcos Talau - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Author: Marcos Talau (talau@users.sourceforge.net) - * - * Thanks to: Duy Nguyen by RED efforts in NS3 - * */ /* - * PORT NOTE: Almost all comments have also been ported from NS-2 + * PORT NOTE: This code was ported from ns-2 (queue/red.cc). Almost all + * comments have also been ported from NS-2 */ #include "ns3/log.h" diff --git a/src/network/utils/red-queue.h b/src/network/utils/red-queue.h index 2951634c1..8c81966a3 100644 --- a/src/network/utils/red-queue.h +++ b/src/network/utils/red-queue.h @@ -1,6 +1,27 @@ /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* - * This code was ported from ns-2 (queue/red.h), with license: + * Copyright © 2011 Marcos Talau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Marcos Talau (talau@users.sourceforge.net) + * + * Thanks to: Duy Nguyen by RED efforts in NS3 + * + * + * This file incorporates work covered by the following copyright and + * permission notice: * * Copyright (c) 1990-1997 Regents of the University of California. * All rights reserved. @@ -28,32 +49,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * This port: - * - * Copyright © 2011 Marcos Talau - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Author: Marcos Talau (talau@users.sourceforge.net) - * - * Thanks to: Duy Nguyen by RED efforts in NS3 - * */ /* - * PORT NOTE: Almost all comments also been ported from NS-2 + * PORT NOTE: This code was ported from ns-2 (queue/red.h). Almost all + * comments also been ported from NS-2. * This implementation aims to be close to the results cited in [0] * [0] S.Floyd, K.Fall http://icir.org/floyd/papers/redsims.ps */