It is ok to send 402 to local clients for any hunt_server operation.

[solanum.git] / src / s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index d33afa240e8b564e121842e24011f47015454023..926e607e09c33ebcab0ef330f0db93a1d1f9d299 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -334,7 +334,7 @@ hunt_server(struct Client *client_p, struct Client *source_p,
                return (HUNTED_PASS);
        }
 
-       if(!IsDigit(parv[server][0]))
+       if(MyClient(source_p) || !IsDigit(parv[server][0]))
                sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
                                   form_str(ERR_NOSUCHSERVER), parv[server]);
        return (HUNTED_NOSUCH);
@@ -695,7 +695,7 @@ burst_TS5(struct Client *client_p)
                           target_p->name, target_p->hopcount + 1,
                           (long) target_p->tsinfo, ubuf,
                           target_p->username, target_p->host,
-                          target_p->user->server, target_p->info);
+                          target_p->servptr->name, target_p->info);
 
                if(IsDynSpoof(target_p))
                        sendto_one(client_p, ":%s ENCAP * REALHOST %s",
@@ -849,7 +849,7 @@ burst_TS6(struct Client *client_p)
                                        (long) target_p->tsinfo,
                                        ubuf,
                                        target_p->username, target_p->host,
-                                       target_p->user->server, target_p->info);
+                                       target_p->servptr->name, target_p->info);
 
                if(!has_id(target_p) || !IsCapable(client_p, CAP_EUID))
                {
@@ -1107,8 +1107,6 @@ server_estab(struct Client *client_p)
        add_to_client_hash(client_p->name, client_p);
        /* doesnt duplicate client_p->serv if allocated this struct already */
        make_server(client_p);
-       client_p->serv->up = me.name;
-       client_p->serv->upid = me.id;
 
        client_p->serv->caps = client_p->localClient->caps;
 
@@ -1119,8 +1117,7 @@ server_estab(struct Client *client_p)
                client_p->localClient->fullcaps = NULL;
        }
 
-       /* add it to scache */
-       find_or_add(client_p->name);
+       client_p->serv->nameinfo = scache_connect(client_p->name, client_p->info, IsHidden(client_p));
        client_p->localClient->firsttime = CurrentTime;
        /* fixing eob timings.. -gnp */
 
@@ -1218,12 +1215,12 @@ server_estab(struct Client *client_p)
                /* presumption, if target has an id, so does its uplink */
                if(has_id(client_p) && has_id(target_p))
                        sendto_one(client_p, ":%s SID %s %d %s :%s%s",
-                                  target_p->serv->upid, target_p->name,
+                                  target_p->servptr->id, target_p->name,
                                   target_p->hopcount + 1, target_p->id,
                                   IsHidden(target_p) ? "(H) " : "", target_p->info);
                else
                        sendto_one(client_p, ":%s SERVER %s %d :%s%s",
-                                  target_p->serv->up,
+                                  target_p->servptr->name,
                                   target_p->name, target_p->hopcount + 1,
                                   IsHidden(target_p) ? "(H) " : "", target_p->info);
 
@@ -1479,6 +1476,7 @@ serv_connect(struct server_conf *server_p, struct Client *by)
        struct Client *client_p;
        struct irc_sockaddr_storage myipnum; 
        int fd;
+       char vhoststr[HOSTIPLEN];
 
        s_assert(server_p != NULL);
        if(server_p == NULL)
@@ -1565,18 +1563,9 @@ serv_connect(struct server_conf *server_p, struct Client *by)
                        free_user(client_p->serv->user, NULL);
                client_p->serv->user = NULL;
        }
-       client_p->serv->up = me.name;
-       client_p->serv->upid = me.id;
        SetConnecting(client_p);
        dlinkAddTail(client_p, &client_p->node, &global_client_list);
 
-       /* log */
-       ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", server_p->name, server_p->host, server_p->port,
-#ifdef IPV6
-                       server_p->aftype == AF_INET6 ? "IPv6" :
-#endif
-                       (server_p->aftype == AF_INET ? "IPv4" : "?"));
-
        if(ServerConfVhosted(server_p))
        {
                memcpy(&myipnum, &server_p->my_ipnum, sizeof(myipnum));
@@ -1603,6 +1592,13 @@ serv_connect(struct server_conf *server_p, struct Client *by)
 #endif
        else
        {
+               /* log */
+               ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", server_p->name, server_p->host, server_p->port,
+#ifdef IPV6
+                               server_p->aftype == AF_INET6 ? "IPv6" :
+#endif
+                               (server_p->aftype == AF_INET ? "IPv4" : "?"));
+
                comm_connect_tcp(client_p->localClient->fd, server_p->host,
                                 server_p->port, NULL, 0, serv_connect_callback, 
                                 client_p, server_p->aftype, 
@@ -1610,6 +1606,15 @@ serv_connect(struct server_conf *server_p, struct Client *by)
                 return 1;
        }
 
+       /* log */
+       inetntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr);
+       ilog(L_SERVER, "Connecting to %s[%s] port %d (%s) (vhost %s)", server_p->name, server_p->host, server_p->port,
+#ifdef IPV6
+                       server_p->aftype == AF_INET6 ? "IPv6" :
+#endif
+                       (server_p->aftype == AF_INET ? "IPv4" : "?"), vhoststr);
+
+
        comm_connect_tcp(client_p->localClient->fd, server_p->host,
                         server_p->port, (struct sockaddr *) &myipnum,
                         GET_SS_LEN(myipnum), serv_connect_callback, client_p,