Return IPv4/IPv6 address to connect hook callback when connection is ok (used by IRC plugin to display IP of IRC server)

4 files changed, 106 insertions, 12 deletions

diff --git a/src/core/wee-hook.h b/src/core/wee-hook.h
index 566e4a119..3c0c15f2b 100644
--- a/src/core/wee-hook.h
+++ b/src/core/wee-hook.h
@@ -120,7 +120,7 @@ struct t_hook_fd
     int flags;                         /* fd flags (read,write,..)          */
 };
 
-typedef int (t_hook_callback_connect)(void *data, int status);
+typedef int (t_hook_callback_connect)(void *data, int status, char *ip_address);
 
 struct t_hook_connect
 {
diff --git a/src/core/wee-network.c b/src/core/wee-network.c
index 33c031cca..9f100a8ad 100644
--- a/src/core/wee-network.c
+++ b/src/core/wee-network.c
@@ -511,8 +511,10 @@ void
 network_connect_child (struct t_hook *hook_connect)
 {
     struct addrinfo hints, *res, *res_local;
-    char status_str[2];
-    int rc;
+    char status_str[2], *ptr_address, *status_ok_with_address;
+    char ipv4_address[INET_ADDRSTRLEN + 1], ipv6_address[INET6_ADDRSTRLEN + 1];
+    char status_ok_without_address[1 + 5 + 1];
+    int rc, length;
     
     res = NULL;
     res_local = NULL;
@@ -663,7 +665,55 @@ network_connect_child (struct t_hook *hook_connect)
     
     /* connection ok */
     status_str[0] = '0' + WEECHAT_HOOK_CONNECT_OK;
-    write (HOOK_CONNECT(hook_connect, child_write), status_str, 1);
+    
+    status_ok_with_address = NULL;
+    ptr_address = NULL;
+    if (HOOK_CONNECT(hook_connect, ipv6))
+    {
+        if (inet_ntop (AF_INET6,
+                       &((struct sockaddr_in6 *)(res->ai_addr))->sin6_addr,
+                       ipv6_address,
+                       INET6_ADDRSTRLEN))
+        {
+            ptr_address = ipv6_address;
+        }
+    }
+    else
+    {
+        //ip = inet_ntoa (((struct sockaddr_in *)(res->ai_addr))->sin_addr);
+        if (inet_ntop (AF_INET,
+                       &((struct sockaddr_in *)(res->ai_addr))->sin_addr,
+                       ipv4_address,
+                       INET_ADDRSTRLEN))
+        {
+            ptr_address = ipv4_address;
+        }
+    }
+    if (ptr_address)
+    {
+        length = strlen (status_str) + 5 + strlen (ptr_address) + 1;
+        status_ok_with_address = malloc (length);
+        if (status_ok_with_address)
+        {
+            snprintf (status_ok_with_address, length, "%s%05d%s",
+                      status_str, strlen (ptr_address), ptr_address);
+        }
+    }
+    
+    if (status_ok_with_address)
+    {
+        write (HOOK_CONNECT(hook_connect, child_write),
+               status_ok_with_address, strlen (status_ok_with_address));
+        free (status_ok_with_address);
+    }
+    else
+    {
+        snprintf (status_ok_without_address, sizeof (status_ok_without_address),
+                  "%s%05d", status_str, 0);
+        write (HOOK_CONNECT(hook_connect, child_write),
+               status_ok_without_address, strlen (status_ok_without_address));
+    }
+    
     if (res)
         freeaddrinfo (res);
     if (res_local)
@@ -678,20 +728,47 @@ int
 network_connect_child_read_cb (void *arg_hook_connect)
 {
     struct t_hook *hook_connect;
-    char buffer[1];
+    char buffer[1], buf_size_ip[6], *ip_address, *error;
     int num_read;
+    long size_ip;
 #ifdef HAVE_GNUTLS
     int rc;
 #endif
     
     hook_connect = (struct t_hook *)arg_hook_connect;
     
+    ip_address = NULL;
+    
     num_read = read (HOOK_CONNECT(hook_connect, child_read),
                      buffer, sizeof (buffer));
     if (num_read > 0)
     {
         if (buffer[0] - '0' == WEECHAT_HOOK_CONNECT_OK)
         {
+            buf_size_ip[5] = '\0';
+            num_read = read (HOOK_CONNECT(hook_connect, child_read),
+                             buf_size_ip, 5);
+            if (num_read == 5)
+            {
+                error = NULL;
+                size_ip = strtol (buf_size_ip, &error, 10);
+                if (error && !error[0])
+                {
+                    ip_address = malloc (size_ip + 1);
+                    if (ip_address)
+                    {
+                        num_read = read (HOOK_CONNECT(hook_connect, child_read),
+                                         ip_address, size_ip);
+                        if (num_read == size_ip)
+                            ip_address[size_ip] = '\0';
+                        else
+                        {
+                            free (ip_address);
+                            ip_address = NULL;
+                        }
+                    }
+                }
+            }
 #ifdef HAVE_GNUTLS
             if (HOOK_CONNECT(hook_connect, gnutls_sess))
             {
@@ -708,18 +785,25 @@ network_connect_child_read_cb (void *arg_hook_connect)
                 if (rc != GNUTLS_E_SUCCESS)
                 {
                     (void) (HOOK_CONNECT(hook_connect, callback))
-                        (hook_connect->callback_data, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR);
+                        (hook_connect->callback_data,
+                         WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
+                         ip_address);
                     unhook (hook_connect);
+                    if (ip_address)
+                        free (ip_address);
                     return WEECHAT_RC_OK;
                 }
             }
 #endif
         }
         (void) (HOOK_CONNECT(hook_connect, callback))
-            (hook_connect->callback_data, buffer[0] - '0');
+            (hook_connect->callback_data, buffer[0] - '0', ip_address);
         unhook (hook_connect);
     }
     
+    if (ip_address)
+        free (ip_address);
+    
     return WEECHAT_RC_OK;
 }
 
@@ -743,7 +827,8 @@ network_connect_with_fork (struct t_hook *hook_connect)
         {
             (void) (HOOK_CONNECT(hook_connect, callback))
                 (hook_connect->callback_data,
-                 '0' + WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR);
+                 '0' + WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR,
+                 NULL);
             unhook (hook_connect);
             return;
         }
@@ -765,7 +850,8 @@ network_connect_with_fork (struct t_hook *hook_connect)
     {
         (void) (HOOK_CONNECT(hook_connect, callback))
             (hook_connect->callback_data,
-             '0' + WEECHAT_HOOK_CONNECT_MEMORY_ERROR);
+             '0' + WEECHAT_HOOK_CONNECT_MEMORY_ERROR,
+             NULL);
         unhook (hook_connect);
         return;
     }
@@ -786,7 +872,8 @@ network_connect_with_fork (struct t_hook *hook_connect)
         case -1:
             (void) (HOOK_CONNECT(hook_connect, callback))
                 (hook_connect->callback_data,
-                 '0' + WEECHAT_HOOK_CONNECT_MEMORY_ERROR);
+                 '0' + WEECHAT_HOOK_CONNECT_MEMORY_ERROR,
+                 NULL);
             unhook (hook_connect);
             return;
         /* child process */
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 47cb2303b..a34710d34 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -1956,7 +1956,7 @@ irc_server_switch_address (struct t_irc_server *server)
  */
 
 int
-irc_server_connect_cb (void *arg_server, int status)
+irc_server_connect_cb (void *arg_server, int status, char *ip_address)
 {
     struct t_irc_server *server;
     int config_proxy_use;
@@ -1972,6 +1972,11 @@ irc_server_connect_cb (void *arg_server, int status)
     {
         case WEECHAT_HOOK_CONNECT_OK:
             /* login to server */
+            weechat_printf (server->buffer,
+                            _("%s: connected to %s (%s)"),
+                            IRC_PLUGIN_NAME,
+                            server->addresses_array[server->current_address],
+                            (ip_address) ? ip_address : "?");
             irc_server_login (server);
             server->hook_fd = weechat_hook_fd (server->sock,
                                                1, 0, 0,
diff --git a/src/plugins/weechat-plugin.h b/src/plugins/weechat-plugin.h
index de2c7c567..3f9dbf53f 100644
--- a/src/plugins/weechat-plugin.h
+++ b/src/plugins/weechat-plugin.h
@@ -326,7 +326,9 @@ struct t_weechat_plugin
                                     const char *address, int port,
                                     int sock, int ipv6, void *gnutls_sess,
                                     const char *local_hostname,
-                                    int (*callback)(void *data, int status),
+                                    int (*callback)(void *data,
+                                                    int status,
+                                                    char *ip_address),
                                     void *callback_data);
     struct t_hook *(*hook_print) (struct t_weechat_plugin *plugin,
                                   struct t_gui_buffer *buffer,