[TSACR-28] Added DhcpServerAddresssubmit/tizen/20170710.054626accepted/tizen/unified/20170710.154540

Change-Id: I564ba3c6a5e83b0ddee11a823f055971b19f9a04
Signed-off-by: adhavan.m <adhavan.m@samsung.com>

4 files changed, 30 insertions, 2 deletions

diff --git a/Tizen.Network.WiFi/Interop/Interop.WiFi.cs b/Tizen.Network.WiFi/Interop/Interop.WiFi.cs
index e13bad4..bc2fd1d 100755
--- a/Tizen.Network.WiFi/Interop/Interop.WiFi.cs
+++ b/Tizen.Network.WiFi/Interop/Interop.WiFi.cs
@@ -149,6 +149,8 @@ internal static partial class Interop
             internal static extern int GetGatewayAddress(SafeWiFiAPHandle ap, int addressFamily, out IntPtr gatewayAddress);
             [DllImport(Libraries.WiFi, EntryPoint = "wifi_manager_ap_set_gateway_address")]
             internal static extern int SetGatewayAddress(SafeWiFiAPHandle ap, int addressFamily, string gatewayAddress);
+            [DllImport(Libraries.WiFi, EntryPoint = "wifi_manager_ap_get_dhcp_server_address")]
+            internal static extern int GetDhcpServerAddress(SafeWiFiAPHandle ap, AddressFamily addressFamily, out string dhcpServer);
             [DllImport(Libraries.WiFi, EntryPoint = "wifi_manager_ap_get_proxy_address")]
             internal static extern int GetProxyAddress(SafeWiFiAPHandle ap, int addressFamily, out IntPtr proxyAddress);
             [DllImport(Libraries.WiFi, EntryPoint = "wifi_manager_ap_set_proxy_address")]
diff --git a/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj b/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj
index b3e36d7..5adbcd1 100644
--- a/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj
+++ b/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.0.18</Version>
+    <Version>1.0.19</Version>
     <Authors>Samsung Electronics</Authors>
     <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
     <Description>Provides the Wi-Fi APIs for Tizen .NET</Description>
diff --git a/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAddressInformation.cs b/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAddressInformation.cs
index 52cbdaa..03e8d37 100755
--- a/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAddressInformation.cs
+++ b/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAddressInformation.cs
@@ -16,6 +16,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using System.Net;
 using Tizen.Network.Connection;
 
 namespace Tizen.Network.WiFi
@@ -241,5 +242,30 @@ namespace Tizen.Network.WiFi
                 }
             }
         }
+
+        /// <summary>
+        /// DHCP server address. It is only supported for IPv4 address family.
+        /// </summary>
+        /// <value>Represents DHCP server address.</value>
+        public System.Net.IPAddress DhcpServerAddress
+        {
+            get
+            {
+                string dhcpServer;
+                int ret = Interop.WiFi.AP.GetDhcpServerAddress(_handle, AddressFamily.IPv4, out dhcpServer);
+                if (ret != (int)WiFiError.None)
+                {
+                    Log.Error(Globals.LogTag, "Failed to get DHCP server address, Error - " + (WiFiError)ret);
+                }
+
+                if (dhcpServer == null)
+                {
+                    return IPAddress.Parse("0.0.0.0");
+                }
+
+                return IPAddress.Parse(dhcpServer);
+            }
+        }
+
     }
 }
diff --git a/packaging/csapi-network-wifi.spec b/packaging/csapi-network-wifi.spec
index 0a9acd1..c36856f 100755
--- a/packaging/csapi-network-wifi.spec
+++ b/packaging/csapi-network-wifi.spec
@@ -1,6 +1,6 @@
 Name:       csapi-network-wifi
 Summary:    Tizen Wi-Fi API for C#
-Version:    1.0.18
+Version:    1.0.19
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0