updates.

[silc.git] / lib / silcutil / silcnet.c

diff --git a/lib/silcutil/silcnet.c b/lib/silcutil/silcnet.c
index d92d80a69d70da8a500874c68579693ba557cf25..0101faae4d344522048cd24f515cf539df633f40 100644 (file)
--- a/lib/silcutil/silcnet.c
+++ b/lib/silcutil/silcnet.c
@@ -43,6 +43,7 @@ int silc_net_get_socket_opt(int sock, int level, int option,
 {
   return getsockopt(sock, level, option, optval, opt_len);
 }
+
 /* Checks whether IP address sent as argument is valid IP address. */
 
 bool silc_net_is_ip(const char *addr)
@@ -104,7 +105,7 @@ bool silc_net_check_host_by_sock(int sock, char **hostname, char **ip)
   /* Find the address from list */
   for (i = 0; dest->h_addr_list[i]; i++)
     if (!memcmp(dest->h_addr_list[i], &remote.sin_addr, 
-              sizeof(struct in_addr)))
+               sizeof(struct in_addr)))
       break;
   if (!dest->h_addr_list[i])
     return FALSE;
@@ -214,10 +215,11 @@ uint16 silc_net_get_local_port(int sock)
 
 /* Return name of localhost. */
 
-char *silc_net_localhost()
+char *silc_net_localhost(void)
 {
   char hostname[256];
   struct hostent *dest;
+  char *h;
 
   if (gethostname(hostname, sizeof(hostname)))
     return NULL;
@@ -226,5 +228,34 @@ char *silc_net_localhost()
   if (!dest)
     return strdup(hostname);
 
+  h = strdup(dest->h_name);
+  dest = gethostbyaddr((char *)dest->h_addr_list[0],
+                      sizeof(struct in_addr), AF_INET);
+  if (!dest)
+    return h;
+
+  silc_free(h);
   return strdup(dest->h_name);
 }
+
+/* Returns local IP address */
+
+char *silc_net_localip(void)
+{
+  char hostname[256];
+  struct hostent *dest;
+  struct in_addr ip;
+  char *ips;
+
+  if (gethostname(hostname, sizeof(hostname)))
+    return NULL;
+
+  dest = gethostbyname(hostname);
+  if (!dest)
+    return NULL;
+
+  memcpy(&ip.s_addr, dest->h_addr_list[0], 4);
+  ips = inet_ntoa(ip);
+
+  return strdup(ips);
+}