diff options
| author | Campus <campus@ntop.org> | 2017-06-02 20:10:58 +0200 |
|---|---|---|
| committer | Campus <campus@ntop.org> | 2017-06-02 20:10:58 +0200 |
| commit | a5268b1137b7df4d38d2869244672f56db15d409 (patch) | |
| tree | 97a9929e44160e95f0ece8a8c2ab98536c00b9ad | |
| parent | 6b5f640849b510e1f5137b8a6e2fb7d707cebaa1 (diff) | |
| parent | 1b5b38a3bad443d11f7ba34ed4a995fb3e9efffc (diff) | |
Merge branch 'dev' of https://github.com/ntop/nDPI into dev
| -rw-r--r-- | src/lib/third_party/include/libcache.h | 24 | ||||
| -rw-r--r-- | src/lib/third_party/src/libcache.c | 24 |
2 files changed, 42 insertions, 6 deletions
diff --git a/src/lib/third_party/include/libcache.h b/src/lib/third_party/include/libcache.h index da3e9411f..53632616e 100644 --- a/src/lib/third_party/include/libcache.h +++ b/src/lib/third_party/include/libcache.h @@ -1,7 +1,25 @@ /** - * @file libcache.h - * @author William Guglielmo <william@deselmo.com> - * @brief File containing header of cache_t type. + * libcache.h + * +Copyright (c) 2017 William Guglielmo <william@deselmo.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. * */ diff --git a/src/lib/third_party/src/libcache.c b/src/lib/third_party/src/libcache.c index bc16d37dc..0a2ce6f6a 100644 --- a/src/lib/third_party/src/libcache.c +++ b/src/lib/third_party/src/libcache.c @@ -1,7 +1,25 @@ /** - * @file libcache.c - * @author William Guglielmo - * @brief File containing implementation of cache_t type. + * libcache.c + * +Copyright (c) 2017 William Guglielmo <william@deselmo.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. * */ |