From 8223c41a70289ffc8c1c3ddbf56be7b11e91d024 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Thu, 11 Feb 2016 12:31:50 +0100 Subject: Added CONTRIBUTORS file --- CONTRIBUTORS | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CONTRIBUTORS diff --git a/CONTRIBUTORS b/CONTRIBUTORS new file mode 100644 index 00000000..38aadbbc --- /dev/null +++ b/CONTRIBUTORS @@ -0,0 +1,2 @@ +dimitri staessens +sander vrijders -- cgit v1.2.3 From 415f7e3fbbac65494a730526f1a879f098a80bf9 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Thu, 11 Feb 2016 12:39:54 +0100 Subject: Fixed the LICENSE file Removed the discussion on how people can use the file. --- LICENSE | 59 ----------------------------------------------------------- 1 file changed, 59 deletions(-) diff --git a/LICENSE b/LICENSE index d511905c..e37680cf 100644 --- a/LICENSE +++ b/LICENSE @@ -278,62 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. -- cgit v1.2.3 From ac0b1a09087520c6adf3a27338ee3f1da233880c Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Fri, 12 Feb 2016 10:30:17 +0100 Subject: Capitalized names in CONTRIBUTORS --- CONTRIBUTORS | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 38aadbbc..eeff71ad 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,2 +1,5 @@ -dimitri staessens -sander vrijders +This file contains a list of people who have made large contributions to +Ouroboros, in alphabetical order. + +Dimitri Staessens +Sander Vrijders -- cgit v1.2.3 From 38962e5630e1fd03012b858bb20f799c461fb859 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Fri, 12 Feb 2016 11:19:43 +0100 Subject: Updated FRCT description Updated the description for the Flow and Retransmission Control Task. --- doc/highlevelarchitecture.txt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/highlevelarchitecture.txt b/doc/highlevelarchitecture.txt index 2c0ab796..50540d12 100644 --- a/doc/highlevelarchitecture.txt +++ b/doc/highlevelarchitecture.txt @@ -9,9 +9,8 @@ interfaces. The main focus of Ouroboros is portability, to allow the prototype to be deployed on different platforms and in widely varying environments. -This document will assume the reader is familiar with RINA -terminology. Please see the reference model for a more in-depth -description of RINA. +This document will assume the reader is familiar with RINA terminology. +Please see the reference model for a more in-depth description of RINA. 2. The Ouroboros Framework @@ -293,13 +292,13 @@ events happening in the DIF and publishers can publish these events. * Flow and Retransmission Control Task * -The flow and retransmission control task, originally known as the -Error and Flow Control Protocol, provides the flow with flow control -and (if needed) retransmission control. It consists of two parts: Data -Transfer (DT) and Data Transfer Control (DTC). DT is for instance -concerned with concatenation, multiplexing, reassembly, ... DTC provides -flow control and retransmission control. DT and DTC communicate with -each other through a shared state vector. +The Flow and Retransmission Control Task (FRCT), originally known as +the Error and Flow Control Protocol (EFCP), provides the flow with +flow control and (if needed) retransmission control. It manages the +shared state between two protocol machines: the Data Transfer Protocol +(DTP) AE and the Data Transfer Control Protocol (DTCP) AE. DTP is for +instance concerned with concatenation, multiplexing, reassembly,... +DTCP provides flow control and retransmission control. * Relaying and Multiplexing Task * -- cgit v1.2.3