License version update and prevent issue resolved

Change-Id: I39147da1784d2b1b4daed33ac596e413a897d60c

diff --git a/NOTICE b/NOTICE
index 4297ee3350f479a5abf9f6237caa620814195c37..37c5da05da2697d291a7e852049c24af0af43d6c 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1 +1,4 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.1.
+Please, see the LICENSE.Flora file for Flora License terms and conditions.
+

diff --git a/popup-wifidirect/include/wfd-app-strings.h b/popup-wifidirect/include/wfd-app-strings.h
index 1110cc5993a86407644c817806a4e900b08bbbc3..e82b044c2412396b89c94da599ea94b1daa720f4 100755 (executable)
--- a/popup-wifidirect/include/wfd-app-strings.h
+++ b/popup-wifidirect/include/wfd-app-strings.h
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/popup-wifidirect/include/wfd-app-util.h b/popup-wifidirect/include/wfd-app-util.h
index 07a1584d55afff0ce406fcd8deaf1494712ab158..34b401f8ba3d2d5bae935fdc6c1923f754720a27 100755 (executable)
--- a/popup-wifidirect/include/wfd-app-util.h
+++ b/popup-wifidirect/include/wfd-app-util.h
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/popup-wifidirect/include/wfd-app.h b/popup-wifidirect/include/wfd-app.h
index 486f30fc03834cc77ada779dfbe455cc6bfdd58a..160a2e4196db6811f42ac5cb34018f95a63a06dd 100755 (executable)
--- a/popup-wifidirect/include/wfd-app.h
+++ b/popup-wifidirect/include/wfd-app.h
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/popup-wifidirect/src/wfd-app-client.c b/popup-wifidirect/src/wfd-app-client.c
index 72595ed969ed8feb3f807b1463a667b7b01b8454..81f4cda9fe8ed222ad4fef5eadddb685d24dfb9a 100755 (executable)
--- a/popup-wifidirect/src/wfd-app-client.c
+++ b/popup-wifidirect/src/wfd-app-client.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/popup-wifidirect/src/wfd-app-main.c b/popup-wifidirect/src/wfd-app-main.c
index c35171c3f86c02150b7ffc0791a5be1add89eee0..17d9b1a8da267abc6e763b162ed0616b6ab1cf7d 100755 (executable)
--- a/popup-wifidirect/src/wfd-app-main.c
+++ b/popup-wifidirect/src/wfd-app-main.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c
index e9ac242299e37e352682234eb4058eddd50e8189..2dd5c9755a9dfc4bcba4da08963e64e54d202cec 100755 (executable)
--- a/popup-wifidirect/src/wfd-app-popup-view.c
+++ b/popup-wifidirect/src/wfd-app-popup-view.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/popup-wifidirect/src/wfd-app-util.c b/popup-wifidirect/src/wfd-app-util.c
index 406b3f39545030ce25d388c6dfc4012c8037c0b8..5bb7a70ccd2e3270f68e2222d2fea85da45bbd12 100644 (file)
--- a/popup-wifidirect/src/wfd-app-util.c
+++ b/popup-wifidirect/src/wfd-app-util.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ug-wifidirect/include/wfd_client.h b/ug-wifidirect/include/wfd_client.h
index a39308130e428697bc39f48d1b7c3bcb37dca3c7..e6fb2d88a192166ac67ca0db01d384b2f60c3c65 100644 (file)
--- a/ug-wifidirect/include/wfd_client.h
+++ b/ug-wifidirect/include/wfd_client.h
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ug-wifidirect/include/wfd_ug.h b/ug-wifidirect/include/wfd_ug.h
index 1edc7dc25f62f2bf18c2911bbcb6810fe2d8ebf5..b3ae8a46fd25cdd784d3c2da8c5c7977d0bc64ce 100755 (executable)
--- a/ug-wifidirect/include/wfd_ug.h
+++ b/ug-wifidirect/include/wfd_ug.h
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ug-wifidirect/include/wfd_ug_view.h b/ug-wifidirect/include/wfd_ug_view.h
index 17b87c902b1b3eaaaf2526f4d28eb3c8974bb750..0783f7ff0655dea2a6d7680dbcfe85c1e3c68fae 100755 (executable)
--- a/ug-wifidirect/include/wfd_ug_view.h
+++ b/ug-wifidirect/include/wfd_ug_view.h
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c
index e46ba008e16f6d0a32b053b2a3fb82b3919b5ded..ff9d91933a40c64bf78bf313aca781a559c4c30c 100755 (executable)
--- a/ug-wifidirect/src/wfd_client.c
+++ b/ug-wifidirect/src/wfd_client.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
@@ -549,10 +549,13 @@ bool _wfd_discoverd_peer_cb(wifi_direct_discovered_peer_info_s *peer, void *user
 
        WDUG_LOGI("%dth discovered peer. [%s] [%s]\n", peer_cnt, peer->device_name, peer->mac_address);
 
-       strncpy(ugd->raw_discovered_peers[peer_cnt].ssid, peer->device_name, sizeof(ugd->raw_discovered_peers[peer_cnt].ssid));
+       strncpy(ugd->raw_discovered_peers[peer_cnt].ssid, peer->device_name, SSID_LENGTH);
+       ugd->raw_discovered_peers[peer_cnt].ssid[SSID_LENGTH-1] = '\0';
        ugd->raw_discovered_peers[peer_cnt].category = peer->primary_device_type;
        strncpy(ugd->raw_discovered_peers[peer_cnt].mac_addr, peer->mac_address, MAC_LENGTH);
+       ugd->raw_discovered_peers[peer_cnt].mac_addr[MAC_LENGTH-1] = '\0';
        strncpy(ugd->raw_discovered_peers[peer_cnt].if_addr, peer->interface_address, MAC_LENGTH);
+       ugd->raw_discovered_peers[peer_cnt].if_addr[MAC_LENGTH-1] = '\0';
        ugd->raw_discovered_peers[peer_cnt].is_group_owner = peer->is_group_owner;
        ugd->raw_discovered_peers[peer_cnt].is_persistent_group_owner = peer->is_persistent_group_owner;
        ugd->raw_discovered_peers[peer_cnt].is_connected = peer->is_connected;

diff --git a/ug-wifidirect/src/wfd_ug.c b/ug-wifidirect/src/wfd_ug.c
index 4eaeb80e9e9586948d1353015ac3d742ee2249c4..45d3493f2e9cda87f1c804cde5bbb4ab9894a604 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug.c
+++ b/ug-wifidirect/src/wfd_ug.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ug-wifidirect/src/wfd_ug_about_view.c b/ug-wifidirect/src/wfd_ug_about_view.c
index a2d79344b7506c220c7d68211e630130b0dba9c8..306f091ef87cf8a75b7492583e2a63a7f3d102c0 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_about_view.c
+++ b/ug-wifidirect/src/wfd_ug_about_view.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ug-wifidirect/src/wfd_ug_genlist.c b/ug-wifidirect/src/wfd_ug_genlist.c
index bff197ce8b930de7457318c351006bd1cdf28124..95781152832fe351779db5d7ee322d4682891c0d 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_genlist.c
+++ b/ug-wifidirect/src/wfd_ug_genlist.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ug-wifidirect/src/wfd_ug_main_view.c b/ug-wifidirect/src/wfd_ug_main_view.c
index 1e9fba36e18b5ccd0131908e17e8c0ae052a0f30..856e363bfbca1c75daed67ed2abeb1b33c0d62ee 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_main_view.c
+++ b/ug-wifidirect/src/wfd_ug_main_view.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ug-wifidirect/src/wfd_ug_multiconnect_view.c b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
index b5cccc3d92748ca96d1fced924ade6532d6b7c13..35a6210da30982193be3a350c23eb30333fd7f52 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_multiconnect_view.c
+++ b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ug-wifidirect/src/wfd_ug_popup.c b/ug-wifidirect/src/wfd_ug_popup.c
index 6959ee243c956a8629c9c09e1882952448232135..585ff87c5d2e5fa331d37f1c5647ebca603770ce 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_popup.c
+++ b/ug-wifidirect/src/wfd_ug_popup.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ugapp-wifidirect/include/wfd-ugapp-util.h b/ugapp-wifidirect/include/wfd-ugapp-util.h
index f13a845b0fe6522109544c8fc07425de0ef4f8e9..916152ca31b4d7a846394db0f9dc14dd6ad710be 100755 (executable)
--- a/ugapp-wifidirect/include/wfd-ugapp-util.h
+++ b/ugapp-wifidirect/include/wfd-ugapp-util.h
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ugapp-wifidirect/include/wfd-ugapp.h b/ugapp-wifidirect/include/wfd-ugapp.h
index 7939ec2342065fdd349e3e18eef12ad7c36bccd7..3408ae465e7f4c2973e91f4695fc41ae5baa4823 100755 (executable)
--- a/ugapp-wifidirect/include/wfd-ugapp.h
+++ b/ugapp-wifidirect/include/wfd-ugapp.h
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ugapp-wifidirect/src/wfd-ugapp-main.c b/ugapp-wifidirect/src/wfd-ugapp-main.c
index 55b1a8e22ed1312105ac8a28217b42c0d2b0f605..6ba9e81327099ff08216f8ed61e6e2fcc410880e 100755 (executable)
--- a/ugapp-wifidirect/src/wfd-ugapp-main.c
+++ b/ugapp-wifidirect/src/wfd-ugapp-main.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (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/ugapp-wifidirect/src/wfd-ugapp-util.c b/ugapp-wifidirect/src/wfd-ugapp-util.c
index a990141230647c8e76a79a09e2d1adf318f84c2a..0307112105c53e0147156f09ab092ca583166ebb 100644 (file)
--- a/ugapp-wifidirect/src/wfd-ugapp-util.c
+++ b/ugapp-wifidirect/src/wfd-ugapp-util.c
@@ -1,9 +1,9 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013 Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at