X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/b813aae3266a0d1b7b0e8a5439825b1331b38745..b869e117f01851f05ff6d02b65b2719e829057a7:/src/s_serv.c diff --git a/src/s_serv.c b/src/s_serv.c index 5241afc..0cd1369 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -55,16 +55,10 @@ #include "reject.h" #include "sslproc.h" -extern char *crypt(); - #ifndef INADDR_NONE #define INADDR_NONE ((unsigned int) 0xffffffff) #endif -#ifndef HAVE_SOCKETPAIR -static int inet_socketpair(int d, int type, int protocol, int sv[2]); -#endif - int MaxConnectionCount = 1; int MaxClientCount = 1; int refresh_user_links = 0; @@ -93,6 +87,7 @@ struct Capability captab[] = { { "RSFNC", CAP_RSFNC }, { "SAVE", CAP_SAVE }, { "EUID", CAP_EUID }, + { "EOPMOD", CAP_EOPMOD }, {0, 0} }; @@ -158,41 +153,23 @@ hunt_server(struct Client *client_p, struct Client *source_p, * Again, if there are no wild cards involved in the server * name, use the hash lookup */ - if(!target_p) + if(!target_p && wilds) { - if(!wilds) + RB_DLINK_FOREACH(ptr, global_client_list.head) { - if(MyClient(source_p) || !IsDigit(parv[server][0])) - sendto_one_numeric(source_p, ERR_NOSUCHSERVER, - form_str(ERR_NOSUCHSERVER), - parv[server]); - return (HUNTED_NOSUCH); - } - else - { - target_p = NULL; - - RB_DLINK_FOREACH(ptr, global_client_list.head) + if(match(new, ((struct Client *) (ptr->data))->name)) { - if(match(new, ((struct Client *) (ptr->data))->name)) - { - target_p = ptr->data; - break; - } + target_p = ptr->data; + break; } } } + if(target_p && !IsRegistered(target_p)) + target_p = NULL; + if(target_p) { - if(!IsRegistered(target_p)) - { - sendto_one_numeric(source_p, ERR_NOSUCHSERVER, - form_str(ERR_NOSUCHSERVER), - parv[server]); - return HUNTED_NOSUCH; - } - if(IsMe(target_p) || MyClient(target_p)) return HUNTED_ISME; @@ -297,15 +274,9 @@ try_connections(void *unused) * error afterwards if it fails. * -- adrian */ -#ifndef HIDE_SERVERS_IPS - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "Connection to %s[%s] activated.", - server_p->name, server_p->host); -#else sendto_realops_snomask(SNO_GENERAL, L_ALL, "Connection to %s activated", server_p->name); -#endif serv_connect(server_p, 0); } @@ -349,7 +320,7 @@ check_server(const char *name, struct Client *client_p) if(ServerConfEncrypted(tmp_p)) { - if(!strcmp(tmp_p->passwd, crypt(client_p->localClient->passwd, + if(!strcmp(tmp_p->passwd, rb_crypt(client_p->localClient->passwd, tmp_p->passwd))) { server_p = tmp_p; @@ -515,7 +486,7 @@ burst_TS6(struct Client *client_p) ubuf[1] = '\0'; } - if(has_id(target_p) && IsCapable(client_p, CAP_EUID)) + if(IsCapable(client_p, CAP_EUID)) sendto_one(client_p, ":%s EUID %s %d %ld %s %s %s %s %s %s %s :%s", target_p->servptr->id, target_p->name, target_p->hopcount + 1, @@ -526,7 +497,7 @@ burst_TS6(struct Client *client_p) IsDynSpoof(target_p) ? target_p->orighost : "*", EmptyString(target_p->user->suser) ? "*" : target_p->user->suser, target_p->info); - else if(has_id(target_p)) + else sendto_one(client_p, ":%s UID %s %d %ld %s %s %s %s %s :%s", target_p->servptr->id, target_p->name, target_p->hopcount + 1, @@ -534,16 +505,12 @@ burst_TS6(struct Client *client_p) target_p->username, target_p->host, IsIPSpoof(target_p) ? "0" : target_p->sockhost, target_p->id, target_p->info); - else - sendto_one(client_p, "NICK %s %d %ld %s %s %s %s :%s", - target_p->name, - target_p->hopcount + 1, - (long) target_p->tsinfo, - ubuf, - target_p->username, target_p->host, - target_p->servptr->name, target_p->info); - - if(!has_id(target_p) || !IsCapable(client_p, CAP_EUID)) + + if(!EmptyString(target_p->certfp)) + sendto_one(client_p, ":%s ENCAP * CERTFP :%s", + use_id(target_p), target_p->certfp); + + if(!IsCapable(client_p, CAP_EUID)) { if(IsDynSpoof(target_p)) sendto_one(client_p, ":%s ENCAP * REALHOST %s", @@ -580,8 +547,12 @@ burst_TS6(struct Client *client_p) msptr = uptr->data; tlen = strlen(use_id(msptr->client_p)) + 1; + if(is_owner(msptr)) + tlen++; if(is_chanop(msptr)) tlen++; + if(is_halfop(msptr)) + tlen++; if(is_voiced(msptr)) tlen++; @@ -768,7 +739,6 @@ server_estab(struct Client *client_p) set_chcap_usage_counts(client_p); rb_dlinkAdd(client_p, &client_p->lnode, &me.serv->servers); - del_unknown_ip(client_p); rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &serv_list); rb_dlinkAddTailAlloc(client_p, &global_serv_list); @@ -800,7 +770,7 @@ server_estab(struct Client *client_p) /* Show the real host/IP to admins */ sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link with %s established: (%s) link", - get_server_name(client_p, SHOW_IP), + client_p->name, show_capabilities(client_p)); ilog(L_SERVER, "Link with %s established: (%s) link", @@ -901,8 +871,7 @@ server_estab(struct Client *client_p) free_pre_client(client_p); - if (!IsCapable(client_p, CAP_ZIP)) - send_pop_queue(client_p); + send_pop_queue(client_p); return 0; } @@ -924,7 +893,7 @@ serv_connect_resolved(struct Client *client_p) if((server_p = client_p->localClient->att_sconf) == NULL) { sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Lost connect{} block for %s", - get_server_name(client_p, HIDE_IP)); + client_p->name); exit_client(client_p, client_p, &me, "Lost connect{} block"); return 0; } @@ -1017,7 +986,7 @@ serv_connect_dns_callback(void *vptr, struct DNSReply *reply) if (reply == NULL) { sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Cannot resolve hostname for %s", - get_server_name(client_p, HIDE_IP)); + client_p->name); ilog(L_SERVER, "Cannot resolve hostname for %s", log_client_name(client_p, HIDE_IP)); exit_client(client_p, client_p, &me, "Cannot resolve hostname"); @@ -1078,10 +1047,10 @@ serv_connect(struct server_conf *server_p, struct Client *by) { sendto_realops_snomask(SNO_GENERAL, L_ALL, "Server %s already present from %s", - server_p->name, get_server_name(client_p, SHOW_IP)); + server_p->name, client_p->name); if(by && IsPerson(by) && !MyClient(by)) sendto_one_notice(by, ":Server %s already present from %s", - server_p->name, get_server_name(client_p, SHOW_IP)); + server_p->name, client_p->name); return 0; } @@ -1184,32 +1153,32 @@ serv_connect(struct server_conf *server_p, struct Client *by) } } -static void -serv_connect_ev(void *data) -{ - struct Client *client_p = data; - serv_connect_callback(client_p->localClient->F, RB_OK, client_p); -} - static void serv_connect_ssl_callback(rb_fde_t *F, int status, void *data) { struct Client *client_p = data; rb_fde_t *xF[2]; + rb_connect_sockaddr(F, (struct sockaddr *)&client_p->localClient->ip, sizeof(client_p->localClient->ip)); if(status != RB_OK) { - /* XXX deal with failure */ + /* Print error message, just like non-SSL. */ + serv_connect_callback(F, status, data); return; } - rb_connect_sockaddr(F, (struct sockaddr *)&client_p->localClient->ip, sizeof(client_p->localClient->ip)); - rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection"); + if(rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection") == -1) + { + ilog_error("rb_socketpair failed for server"); + serv_connect_callback(F, RB_ERROR, data); + return; + + } del_from_cli_fd_hash(client_p); client_p->localClient->F = xF[0]; add_to_cli_fd_hash(client_p); client_p->localClient->ssl_ctl = start_ssld_connect(F, xF[1], rb_get_fd(xF[0])); SetSSL(client_p); - rb_event_addonce("serv_connect_ev", serv_connect_ev, client_p, 1); + serv_connect_callback(client_p->localClient->F, RB_OK, client_p); } /* @@ -1258,11 +1227,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Error connecting to %s[%s]: %s", client_p->name, -#ifdef HIDE_SERVERS_IPS "255.255.255.255", -#else - client_p->host, -#endif rb_errstr(status)); ilog(L_SERVER, "Error connecting to %s[%s]: %s", client_p->name, client_p->sockhost, @@ -1274,11 +1239,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Error connecting to %s[%s]: %s (%s)", client_p->name, -#ifdef HIDE_SERVERS_IPS "255.255.255.255", -#else - client_p->host, -#endif rb_errstr(status), errstr); ilog(L_SERVER, "Error connecting to %s[%s]: %s (%s)", client_p->name, client_p->sockhost, @@ -1294,7 +1255,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) if((server_p = client_p->localClient->att_sconf) == NULL) { sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Lost connect{} block for %s", - get_server_name(client_p, HIDE_IP)); + client_p->name); exit_client(client_p, client_p, &me, "Lost connect{} block"); return; } @@ -1302,9 +1263,6 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) /* Next, send the initial handshake */ SetHandshake(client_p); - /* kludge, if we're not using TS6, dont ever send - * ourselves as being TS6 capable. - */ if(!EmptyString(server_p->spasswd)) { sendto_one(client_p, "PASS %s TS %d :%s", @@ -1337,60 +1295,3 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) /* If we get here, we're ok, so lets start reading some data */ read_packet(F, client_p); } - -#ifndef HAVE_SOCKETPAIR -static int -inet_socketpair(int d, int type, int protocol, int sv[2]) -{ - struct sockaddr_in addr1, addr2, addr3; - int addr3_len = sizeof(addr3); - int fd, rc; - int port_no = 20000; - - if(d != AF_INET || type != SOCK_STREAM || protocol) - { - errno = EAFNOSUPPORT; - return -1; - } - if(((sv[0] = socket(AF_INET, SOCK_STREAM, 0)) < 0) || ((sv[1] = socket(AF_INET, SOCK_STREAM, 0)) < 0)) - return -1; - - addr1.sin_port = htons(port_no); - addr1.sin_family = AF_INET; - addr1.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - while ((rc = bind (sv[0], (struct sockaddr *) &addr1, sizeof (addr1))) < 0 && errno == EADDRINUSE) - addr1.sin_port = htons(++port_no); - - if(rc < 0) - return -1; - - if(listen(sv[0], 1) < 0) - { - close(sv[0]); - close(sv[1]); - return -1; - } - - addr2.sin_port = htons(port_no); - addr2.sin_family = AF_INET; - addr2.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - if(connect (sv[1], (struct sockaddr *) &addr2, sizeof (addr2)) < 0) - { - close(sv[0]); - close(sv[1]); - return -1; - } - - if((fd = accept(sv[1], (struct sockaddr *) &addr3, &addr3_len)) < 0) - { - close(sv[0]); - close(sv[1]); - return -1; - } - close(sv[0]); - sv[0] = fd; - - return(0); - -} -#endif