From 5a2231172c819a0fb52f845531e975e8fa0c78a4 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 1 Sep 2021 13:30:09 +0200 Subject: [PATCH] Updated copyright for proxy --- include/freerdp/server/proxy/proxy_log.h | 2 ++ include/freerdp/server/proxy/proxy_modules_api.h | 2 ++ server/proxy/CMakeLists.txt | 4 +++- server/proxy/modules/capture/CMakeLists.txt | 2 ++ server/proxy/modules/capture/cap_main.c | 2 ++ server/proxy/modules/demo/CMakeLists.txt | 2 ++ server/proxy/modules/demo/demo.cpp | 8 +++++--- server/proxy/pf_channels.c | 2 ++ server/proxy/pf_client.c | 2 ++ server/proxy/pf_cliprdr.c | 2 ++ server/proxy/pf_config.c | 2 ++ server/proxy/pf_context.c | 2 ++ server/proxy/pf_disp.c | 2 ++ server/proxy/pf_gdi.c | 2 ++ server/proxy/pf_graphics.c | 2 ++ server/proxy/pf_input.c | 2 ++ server/proxy/pf_modules.c | 2 ++ server/proxy/pf_rail.c | 2 ++ server/proxy/pf_rdpgfx.c | 2 ++ server/proxy/pf_rdpsnd.c | 2 ++ server/proxy/pf_server.c | 2 ++ server/proxy/pf_server.h | 2 ++ server/proxy/pf_update.c | 2 ++ server/proxy/pf_utils.h | 2 +- 24 files changed, 51 insertions(+), 5 deletions(-) diff --git a/include/freerdp/server/proxy/proxy_log.h b/include/freerdp/server/proxy/proxy_log.h index 4a32f5f00..a37db49b5 100644 --- a/include/freerdp/server/proxy/proxy_log.h +++ b/include/freerdp/server/proxy/proxy_log.h @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/freerdp/server/proxy/proxy_modules_api.h b/include/freerdp/server/proxy/proxy_modules_api.h index 0c869ca7a..556034f2c 100644 --- a/include/freerdp/server/proxy/proxy_modules_api.h +++ b/include/freerdp/server/proxy/proxy_modules_api.h @@ -4,6 +4,8 @@ * * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/CMakeLists.txt b/server/proxy/CMakeLists.txt index 0ec472170..c1ecaa390 100644 --- a/server/proxy/CMakeLists.txt +++ b/server/proxy/CMakeLists.txt @@ -4,7 +4,9 @@ # Copyright 2019 Mati Shabtay # Copyright 2019 Kobi Mizrachi # Copyright 2019 Idan Freiberg - +# Copyright 2021 Armin Novak +# Copyright 2021 Thincast Technologies GmbH +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/server/proxy/modules/capture/CMakeLists.txt b/server/proxy/modules/capture/CMakeLists.txt index cc3e419c4..d3b510a30 100644 --- a/server/proxy/modules/capture/CMakeLists.txt +++ b/server/proxy/modules/capture/CMakeLists.txt @@ -3,6 +3,8 @@ # FreeRDP Proxy Server Capture Module # # Copyright 2019 Kobi Mizrachi +# Copyright 2021 Armin Novak +# Copyright 2021 Thincast Technologies GmbH # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/server/proxy/modules/capture/cap_main.c b/server/proxy/modules/capture/cap_main.c index d0128f004..080644fc9 100644 --- a/server/proxy/modules/capture/cap_main.c +++ b/server/proxy/modules/capture/cap_main.c @@ -3,6 +3,8 @@ * FreeRDP Proxy Server Session Capture Module * * Copyright 2019 Kobi Mizrachi + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/modules/demo/CMakeLists.txt b/server/proxy/modules/demo/CMakeLists.txt index 08bdbcd2c..185f918be 100644 --- a/server/proxy/modules/demo/CMakeLists.txt +++ b/server/proxy/modules/demo/CMakeLists.txt @@ -3,6 +3,8 @@ # FreeRDP Proxy Server Demo C++ Module # # Copyright 2019 Kobi Mizrachi +# Copyright 2021 Armin Novak +# Copyright 2021 Thincast Technologies GmbH # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/server/proxy/modules/demo/demo.cpp b/server/proxy/modules/demo/demo.cpp index e1d58ce0b..f7d036f17 100644 --- a/server/proxy/modules/demo/demo.cpp +++ b/server/proxy/modules/demo/demo.cpp @@ -3,6 +3,8 @@ * FreeRDP Proxy Server Demo C++ Module * * Copyright 2019 Kobi Mizrachi + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +36,7 @@ static BOOL demo_plugin_unload(proxyPlugin* plugin) /* Here we have to free up our custom data storage. */ if (plugin) - free(plugin->custom); + delete (plugin->custom); return TRUE; } @@ -286,7 +288,7 @@ BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userda int somesetting; }; struct demo_custom_data* custom; - proxyPlugin plugin; + proxyPlugin plugin = {}; plugin.name = plugin_name; plugin.description = plugin_desc; @@ -313,7 +315,7 @@ BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userda plugin.ServerPeerLogon = demo_server_peer_logon; plugin.userdata = userdata; - custom = (struct demo_custom_data*)calloc(1, sizeof(struct demo_custom_data)); + custom = new (struct demo_custom_data); if (!custom) return FALSE; diff --git a/server/proxy/pf_channels.c b/server/proxy/pf_channels.c index abdd99f7d..145412bff 100644 --- a/server/proxy/pf_channels.c +++ b/server/proxy/pf_channels.c @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_client.c b/server/proxy/pf_client.c index 40c9c6dca..30037140d 100644 --- a/server/proxy/pf_client.c +++ b/server/proxy/pf_client.c @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_cliprdr.c b/server/proxy/pf_cliprdr.c index 7e622facf..948f85fa7 100644 --- a/server/proxy/pf_cliprdr.c +++ b/server/proxy/pf_cliprdr.c @@ -4,6 +4,8 @@ * * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_config.c b/server/proxy/pf_config.c index b03cb98cb..b7318c448 100644 --- a/server/proxy/pf_config.c +++ b/server/proxy/pf_config.c @@ -4,6 +4,8 @@ * * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_context.c b/server/proxy/pf_context.c index 7573f98c6..a90c0268b 100644 --- a/server/proxy/pf_context.c +++ b/server/proxy/pf_context.c @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_disp.c b/server/proxy/pf_disp.c index 8518de4f4..474ccc326 100644 --- a/server/proxy/pf_disp.c +++ b/server/proxy/pf_disp.c @@ -3,6 +3,8 @@ * FreeRDP Proxy Server * * Copyright 2019 Kobi Mizrachi + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_gdi.c b/server/proxy/pf_gdi.c index e66fb325b..5ded731e9 100644 --- a/server/proxy/pf_gdi.c +++ b/server/proxy/pf_gdi.c @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_graphics.c b/server/proxy/pf_graphics.c index 17c56041d..39d0eb272 100644 --- a/server/proxy/pf_graphics.c +++ b/server/proxy/pf_graphics.c @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_input.c b/server/proxy/pf_input.c index 33fc26b62..afd7cee38 100644 --- a/server/proxy/pf_input.c +++ b/server/proxy/pf_input.c @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_modules.c b/server/proxy/pf_modules.c index 326200dce..74e3a4434 100644 --- a/server/proxy/pf_modules.c +++ b/server/proxy/pf_modules.c @@ -4,6 +4,8 @@ * * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_rail.c b/server/proxy/pf_rail.c index 2a1520cc9..f28110560 100644 --- a/server/proxy/pf_rail.c +++ b/server/proxy/pf_rail.c @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_rdpgfx.c b/server/proxy/pf_rdpgfx.c index 05d5d4d9e..003e57f33 100644 --- a/server/proxy/pf_rdpgfx.c +++ b/server/proxy/pf_rdpgfx.c @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_rdpsnd.c b/server/proxy/pf_rdpsnd.c index e53c14b56..b95de82d0 100644 --- a/server/proxy/pf_rdpsnd.c +++ b/server/proxy/pf_rdpsnd.c @@ -3,6 +3,8 @@ * FreeRDP Proxy Server * * Copyright 2019 Kobi Mizrachi + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c index e4c2bf226..a9e650260 100644 --- a/server/proxy/pf_server.c +++ b/server/proxy/pf_server.c @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_server.h b/server/proxy/pf_server.h index 1d1f13a40..8c665020d 100644 --- a/server/proxy/pf_server.h +++ b/server/proxy/pf_server.h @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_update.c b/server/proxy/pf_update.c index 1382c91bf..c52c03b96 100644 --- a/server/proxy/pf_update.c +++ b/server/proxy/pf_update.c @@ -5,6 +5,8 @@ * Copyright 2019 Mati Shabtay * Copyright 2019 Kobi Mizrachi * Copyright 2019 Idan Freiberg + * Copyright 2021 Armin Novak + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/server/proxy/pf_utils.h b/server/proxy/pf_utils.h index b754bc223..104154b7f 100644 --- a/server/proxy/pf_utils.h +++ b/server/proxy/pf_utils.h @@ -3,7 +3,7 @@ * FreeRDP Proxy Server * * Copyright 2021 Armin Novak - * * Copyright 2021 Thincast Technologies GmbH + * Copyright 2021 Thincast Technologies GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.