X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/cda8e9b8db4e4c46b4270c915724b288924bc173..b37edd511a0db4a1705753a9072274ae310b864e:/src/s_serv.c diff --git a/src/s_serv.c b/src/s_serv.c index d33afa2..7662ae7 100644 --- 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)) { @@ -1003,7 +1003,6 @@ server_estab(struct Client *client_p) s_assert(NULL != client_p); if(client_p == NULL) return -1; - ClearAccess(client_p); host = client_p->name; @@ -1064,7 +1063,7 @@ server_estab(struct Client *client_p) (me.info[0]) ? (me.info) : "IRCers United"); } - if(!comm_set_buffers(client_p->localClient->fd, READBUF_SIZE)) + if(!comm_set_buffers(client_p->localClient->F->fd, READBUF_SIZE)) report_error(SETBUF_ERROR_MSG, get_server_name(client_p, SHOW_IP), log_client_name(client_p, SHOW_IP), errno); @@ -1107,8 +1106,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 +1116,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 */ @@ -1147,11 +1143,11 @@ server_estab(struct Client *client_p) /* we won't overflow FD_DESC_SZ here, as it can hold * client_p->name + 64 */ - comm_note(client_p->localClient->fd, "slink data: %s", client_p->name); + comm_note(client_p->localClient->F->fd, "slink data: %s", client_p->name); comm_note(client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name); } else - comm_note(client_p->localClient->fd, "Server: %s", client_p->name); + comm_note(client_p->localClient->F->fd, "Server: %s", client_p->name); /* ** Old sendto_serv_but_one() call removed because we now @@ -1218,12 +1214,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); @@ -1375,7 +1371,7 @@ fork_server(struct Client *server) { - if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == server->localClient->fd)) + if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == server->localClient->F->fd)) { comm_set_nb(i); } @@ -1390,7 +1386,7 @@ fork_server(struct Client *server) ircsnprintf(fd_str[0], sizeof(fd_str[0]), "%d", ctrl_fds[1]); ircsnprintf(fd_str[1], sizeof(fd_str[1]), "%d", data_fds[1]); - ircsnprintf(fd_str[2], sizeof(fd_str[2]), "%d", server->localClient->fd); + ircsnprintf(fd_str[2], sizeof(fd_str[2]), "%d", server->localClient->F->fd); kid_argv[0] = slink; kid_argv[1] = fd_str[0]; kid_argv[2] = fd_str[1]; @@ -1405,7 +1401,7 @@ fork_server(struct Client *server) } else { - comm_close(server->localClient->fd); + comm_close(server->localClient->F->fd); /* close the childs end of the pipes */ close(ctrl_fds[1]); @@ -1413,9 +1409,9 @@ fork_server(struct Client *server) s_assert(server->localClient); server->localClient->ctrlfd = ctrl_fds[0]; - server->localClient->fd = data_fds[0]; + server->localClient->F = comm_add_fd(data_fds[0]); - if(!comm_set_nb(server->localClient->fd)) + if(!comm_set_nb(server->localClient->F->fd)) { report_error(NONB_ERROR_MSG, get_server_name(server, SHOW_IP), @@ -1432,10 +1428,10 @@ fork_server(struct Client *server) } comm_open(server->localClient->ctrlfd, FD_SOCKET, NULL); - comm_open(server->localClient->fd, FD_SOCKET, NULL); + comm_open(server->localClient->F->fd, FD_SOCKET, NULL); read_ctrl_packet(server->localClient->ctrlfd, server); - read_packet(server->localClient->fd, server); + read_packet(server->localClient->F->fd, server); } return 0; @@ -1479,6 +1475,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) @@ -1520,7 +1517,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) strlcpy(client_p->name, server_p->name, sizeof(client_p->name)); strlcpy(client_p->host, server_p->host, sizeof(client_p->host)); strlcpy(client_p->sockhost, server_p->host, sizeof(client_p->sockhost)); - client_p->localClient->fd = fd; + client_p->localClient->F = comm_add_fd(fd); /* * Set up the initial server evilness, ripped straight from @@ -1528,7 +1525,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) * -- adrian */ - if(!comm_set_buffers(client_p->localClient->fd, READBUF_SIZE)) + if(!comm_set_buffers(client_p->localClient->F->fd, READBUF_SIZE)) { report_error(SETBUF_ERROR_MSG, get_server_name(client_p, SHOW_IP), @@ -1565,18 +1562,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,14 +1591,30 @@ serv_connect(struct server_conf *server_p, struct Client *by) #endif else { - comm_connect_tcp(client_p->localClient->fd, server_p->host, + /* 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->F->fd, server_p->host, server_p->port, NULL, 0, serv_connect_callback, client_p, server_p->aftype, ConfigFileEntry.connect_timeout); return 1; } - comm_connect_tcp(client_p->localClient->fd, server_p->host, + /* 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->F->fd, server_p->host, server_p->port, (struct sockaddr *) &myipnum, GET_SS_LEN(myipnum), serv_connect_callback, client_p, myipnum.ss_family, ConfigFileEntry.connect_timeout); @@ -1637,7 +1641,7 @@ serv_connect_callback(int fd, int status, void *data) /* First, make sure its a real client! */ s_assert(client_p != NULL); - s_assert(client_p->localClient->fd == fd); + s_assert(client_p->localClient->F->fd == fd); if(client_p == NULL) return;