Changeset d179fd90 for irc.c

Timestamp:

2017-04-06T20:25:08Z (7 years ago)

Author:

Wilmer van der Gaast <github@…>

Branches:

master

Children:

0156c42

Parents:

60141cf

git-author:

Wilmer van der Gaast <wilmer@…> (03-04-17 20:55:50)

git-committer:

Wilmer van der Gaast <github@…> (06-04-17 20:25:08)

Message:

Add PROXY command. Not actually an IRC protocol command, it's a HAProxy
trick supported by stunnel to indicate where the connection originally
came from. Looks a little better on public servers.

File:

• irc.c (modified) (5 diffs)

irc.c

@@ -41 +41 @@
 {
         irc_t *irc;
-        struct sockaddr_storage sock;
-        socklen_t socklen = sizeof(sock);
-        char *host = NULL, *myhost = NULL;
         irc_user_t *iu;
         GSList *l;
@@ -64 +61 @@
         irc->iconv = (GIConv) - 1;
         irc->oconv = (GIConv) - 1;
-
-        if (global.conf->hostname) {
-                myhost = g_strdup(global.conf->hostname);
-        } else if (getsockname(irc->fd, (struct sockaddr*) &sock, &socklen) == 0) {
-                myhost = reverse_lookup((struct sockaddr*) &sock, socklen);
-        }
-
-        if (getpeername(irc->fd, (struct sockaddr*) &sock, &socklen) == 0) {
-                host = reverse_lookup((struct sockaddr*) &sock, socklen);
-        }
-
-        if (host == NULL) {
-                host = g_strdup("localhost.localdomain");
-        }
-        if (myhost == NULL) {
-                myhost = g_strdup("localhost.localdomain");
-        }
 
         if (global.conf->ping_interval > 0 && global.conf->ping_timeout > 0) {
@@ -128 +108 @@
 
         irc->root = iu = irc_user_new(irc, ROOT_NICK);
-        iu->host = g_strdup(myhost);
         iu->fullname = g_strdup(ROOT_FN);
         iu->f = &irc_user_root_funcs;
 
         iu = irc_user_new(irc, NS_NICK);
-        iu->host = g_strdup(myhost);
         iu->fullname = g_strdup(ROOT_FN);
         iu->f = &irc_user_root_funcs;
 
         irc->user = g_new0(irc_user_t, 1);
-        irc->user->host = g_strdup(host);
+        
+        irc_set_hosts(irc, NULL, 0);
 
         conf_loaddefaults(irc);
@@ -154 +133 @@
         }
 
-        g_free(myhost);
-        g_free(host);
-
         /* libpurple doesn't like fork()s after initializing itself, so this
            is the right moment to initialize it. */
@@ -176 +152 @@
 
         return irc;
+}
+
+void irc_set_hosts(irc_t *irc, const struct sockaddr *remote_addr, const socklen_t remote_addrlen)
+{
+        struct sockaddr_storage sock;
+        socklen_t socklen = sizeof(sock);
+        char *host = NULL, *myhost = NULL;
+        struct irc_user *iu;
+
+        if (global.conf->hostname) {
+                myhost = g_strdup(global.conf->hostname);
+        } else if (getsockname(irc->fd, (struct sockaddr*) &sock, &socklen) == 0) {
+                myhost = reverse_lookup((struct sockaddr*) &sock, socklen);
+        }
+
+        if (remote_addrlen > 0) {
+                host = reverse_lookup(remote_addr, remote_addrlen);
+        } else if (getpeername(irc->fd, (struct sockaddr*) &sock, &socklen) == 0) {
+                host = reverse_lookup((struct sockaddr*) &sock, socklen);
+        }
+
+        if (myhost == NULL) {
+                myhost = g_strdup("localhost.localdomain");
+        }
+        if (host == NULL) {
+                host = g_strdup("localhost.localdomain");
+        }
+        
+        if (irc->root->host != irc->root->nick) {
+                g_free(irc->root->host);
+        }
+        irc->root->host = g_strdup(myhost);
+        if ((iu = irc_user_by_name(irc, NS_NICK))) {
+                if (iu->host != iu->nick) {
+                        g_free(iu->host);
+                }
+                iu->host = g_strdup(myhost);
+        }
+        
+        if (irc->user->host != irc->user->nick) {
+                g_free(irc->user->host);
+        }
+        irc->user->host = g_strdup(host);
+
+        g_free(myhost);
+        g_free(host);
 }