Changeset 780

Timestamp:

10/02/06 01:30:16 (6 years ago)

Author:

wd

Message:

CHange the way WHOIS behaves to make it uniform no matter where the client
is, move the missing info from WHOIS to XINFO CLIENT.

Location:

branches/ithildin-1.1/modules/ircd/commands

Files:

• whois.c (modified) (1 diff)
• xinfo.c (modified) (2 diffs)

branches/ithildin-1.1/modules/ircd/commands/whois.c

@@ -80 +80 @@
     /* show them the real host if they can see it and this is either a local
      * real client (conn != NULL) or orighost points somewhere different */
-    if (CAN_SEE_REAL_HOST(cli, target)) {
-        if (target->conn != NULL) {
-            /* in this case show them the values we got from identd/dns */
-            if (*target->conn->user == '\0' || *target->conn->user == '~')
-            sendto_one(cli, RPL_FMT(cli, RPL_WHOISACTUALLY), target->nick,
-                        target->user, target->conn->host, target->ip);
-            else
-                sendto_one(cli, RPL_FMT(cli, RPL_WHOISACTUALLY), target->nick,
-                        target->conn->user, target->conn->host, target->ip);
-        } else if (target->orighost != target->host)
-            sendto_one(cli, RPL_FMT(cli, RPL_WHOISACTUALLY), target->nick,
-                    target->user, target->orighost, target->ip);
-    }
+    if (CAN_SEE_REAL_HOST(cli, target) && target->orighost != target->host)
+        sendto_one(cli, RPL_FMT(cli, RPL_WHOISACTUALLY), target->nick,
+                target->user, target->orighost, target->ip);
     if (!CLIENT_MASTER(target) || MYCLIENT(target)) {
         /* don't show channels that master clients are in unless this is a

branches/ithildin-1.1/modules/ircd/commands/xinfo.c

@@ -182 +182 @@
     client_t *cp;
     char rpl[XINFO_LEN];
+    char *user;
+    char ip[IPADDR_MAXLEN + 1];
 
     if (argc < 2) {
@@ -197 +199 @@
     }
                 
-    snprintf(rpl, XINFO_LEN, "%s!%s@%s[%s]", cp->nick, cp->user, cp->host,
-            cp->ip);
+    if (cp->conn != NULL) {
+        /* give them the connection info if we can... */
+        if (*cp->conn->user == '\0' || *cp->conn->user == '~')
+            user = cp->user; /* this information is not valuable here */
+        else
+            user = cp->conn->user;
+        if (cp->conn->sock != NULL) /* should never be NULL but.. */
+            get_socket_address(isock_raddr(cp->conn->sock), ip,
+                    IPADDR_MAXLEN + 1, NULL);
+        else
+            strcpy(ip, cp->ip);
+        snprintf(rpl, XINFO_LEN, "%s!%s@%s[%s]", cp->nick, user,
+                cp->conn->host, ip);
+    } else
+        snprintf(rpl, XINFO_LEN, "%s!%s@%s[%s]", cp->nick, cp->user,
+                cp->host, cp->ip);
     sendto_one(cli, RPL_FMT(cli, RPL_XINFO), "ADDRESS", rpl);
     snprintf(rpl, XINFO_LEN, "TS %d SIGNON %d IDLE %d", cp->ts,