March 2011 - DALnet-src - nomad.dal.net

[PATCH 1/2] Fix relaying of NICKIPSTR NICK messages.
by Ned T. Crigler 15 Mar '11

15 Mar '11

--- include/send.h | 1 + src/s_user.c | 29 ++++++++++++----------------- src/send.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/include/send.h b/include/send.h index 0bc3a89..a96adda 100644 --- a/include/send.h +++ b/include/send.h @@ -74,6 +74,7 @@ extern void sendto_realops_lev(int lev, char *pattern, ...) ATTRIBUTE_PRINTF(2, extern void sendto_realops(char *pattern, ...) ATTRIBUTE_PRINTF(1, 2); extern void sendto_non_noquit_servs_butone(aClient *one, char *pattern, ...) ATTRIBUTE_PRINTF(2, 3); extern void sendto_serv_butone(aClient *one, char *pattern, ...) ATTRIBUTE_PRINTF(2, 3); +extern void sendto_serv_butone_nickipstr(aClient *one, int flag, char *pattern, ...) ATTRIBUTE_PRINTF(3, 4); extern void sendto_serv_butone_super(aClient *one, int flag, char *pattern, ...) ATTRIBUTE_PRINTF(3, 4); extern void sendto_wallops_butone(aClient *one, aClient *from, char *pattern, ...) ATTRIBUTE_PRINTF(3, 4); diff --git a/src/s_user.c b/src/s_user.c index 17da791..6e582bb 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -1078,23 +1078,18 @@ register_user(aClient *cptr, aClient *sptr, char *nick, char *username, ubuf[1] = '\0'; } hash_check_watch(sptr, RPL_LOGON); - if (IsNickIPStr(cptr)) - { - sendto_serv_butone(cptr, "NICK %s %d %ld %s %s %s %s %lu %s :%s", - nick, sptr->hopcount + 1, sptr->tsinfo, ubuf, - user->username, user->host, user->server, - sptr->user->servicestamp, - cipntoa(sptr), sptr->info); - } - else - { - sendto_serv_butone(cptr, "NICK %s %d %ld %s %s %s %s %lu %u :%s", - nick, sptr->hopcount + 1, sptr->tsinfo, ubuf, - user->username, user->host, user->server, - sptr->user->servicestamp, - (sptr->ip_family == AF_INET) ? - htonl(sptr->ip.ip4.s_addr) : 1, sptr->info); - } + + sendto_serv_butone_nickipstr(cptr, 1, "NICK %s %d %ld %s %s %s %s %lu %s :%s", + nick, sptr->hopcount + 1, sptr->tsinfo, ubuf, + user->username, user->host, user->server, + sptr->user->servicestamp, + cipntoa(sptr), sptr->info); + sendto_serv_butone_nickipstr(cptr, 0, "NICK %s %d %ld %s %s %s %s %lu %u :%s", + nick, sptr->hopcount + 1, sptr->tsinfo, ubuf, + user->username, user->host, user->server, + sptr->user->servicestamp, + (sptr->ip_family == AF_INET) ? + htonl(sptr->ip.ip4.s_addr) : 1, sptr->info); if(MyClient(sptr)) { diff --git a/src/send.c b/src/send.c index d81d504..de4f1ea 100644 --- a/src/send.c +++ b/src/send.c @@ -760,6 +760,39 @@ void sendto_non_noquit_servs_butone(aClient *one, char *pattern, ...) #endif /* + * sendto_server_butone_nickipstr + * + * Send a message to all connected servers except the client 'one'. Also select + * servers that do or do not have the NICKIPSTR capability. + */ +void sendto_serv_butone_nickipstr(aClient *one, int flag, char *pattern, ...) +{ + aClient *cptr; + int k = 0; + fdlist send_fdlist; + va_list vl; + DLink *lp; + + va_start(vl, pattern); + for(lp = server_list; lp; lp = lp->next) + { + cptr = lp->value.cptr; + if (one && cptr == one->from) + continue; + if (flag && !IsNickIPStr(cptr)) + continue; + if (!flag && IsNickIPStr(cptr)) + continue; + send_fdlist.entry[++k] = cptr->fd; + } + send_fdlist.last_entry = k; + if (k) + vsendto_fdlist(&send_fdlist, pattern, vl); + va_end(vl); + return; +} + +/* * sendto_server_butone * * Send a message to all connected servers except the client 'one'. -- 1.7.2.3

1 1

[PATCH] Fix some problems found on FreeBSD 6.4
by Ned T. Crigler 14 Mar '11

14 Mar '11

FreeBSD is apparently a lot stricter about the length of the socket structure matching the address family. Also add #include <sys/socket.h> to include/struct.h to get AF_INET and AF_INET6 defined. --- include/struct.h | 1 + src/s_auth.c | 9 +++++++-- src/s_bsd.c | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/struct.h b/include/struct.h index 10074df..f83de0a 100644 --- a/include/struct.h +++ b/include/struct.h @@ -32,6 +32,7 @@ #include <stdio.h> #include <sys/types.h> +#include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> #if defined( HAVE_STDDEF_H ) diff --git a/src/s_auth.c b/src/s_auth.c index de8469a..6cf4d81 100644 --- a/src/s_auth.c +++ b/src/s_auth.c @@ -99,12 +99,17 @@ void start_auth(aClient *cptr) memset(&localaddr, '\0', sizeof(localaddr)); getsockname(cptr->fd, &localaddr.sa, &locallen); if (localaddr.sa.sa_family == AF_INET) + { localaddr.addr4.sin_port = htons(0); + locallen = sizeof(localaddr.addr4); + } else if (localaddr.sa.sa_family == AF_INET6) + { localaddr.addr6.sin6_port = htons(0); + locallen = sizeof(localaddr.addr6); + } - if (bind(cptr->authfd, &localaddr.sa, - sizeof(localaddr)) == -1) + if (bind(cptr->authfd, &localaddr.sa, locallen) == -1) { report_error("binding auth stream socket %s:%s", cptr); close(cptr->authfd); diff --git a/src/s_bsd.c b/src/s_bsd.c index 65585e6..6b62a0a 100644 --- a/src/s_bsd.c +++ b/src/s_bsd.c @@ -295,12 +295,14 @@ int add_listener(aPort *aport) { server.addr6.sin6_family = AF_INET6; server.addr6.sin6_port = htons(lstn.port); + len = sizeof(server.addr6); } else { server.addr4.sin_family = AF_INET; server.addr4.sin_addr.s_addr = inet_addr(aport->address); server.addr4.sin_port = htons(lstn.port); + len = sizeof(server.addr4); } } else @@ -308,6 +310,7 @@ int add_listener(aPort *aport) server.addr4.sin_family = AF_INET; server.addr4.sin_addr.s_addr = INADDR_ANY; server.addr4.sin_port = htons(lstn.port); + len = sizeof(server.addr4); } if(!BadPtr(aport->allow) && server.sa.sa_family == AF_INET) @@ -336,7 +339,7 @@ int add_listener(aPort *aport) set_listener_sock_opts(lstn.fd, &lstn, server.sa.sa_family); - if (bind(lstn.fd, &server.sa, sizeof(server))) + if (bind(lstn.fd, &server.sa, len)) { report_listener_error("binding stream socket %s:%s", &lstn); close(lstn.fd); -- 1.7.2.3

1 0

[PATCH 1/4] Change the resolver to use a larger maximum hostname length.
by Ned T. Crigler 12 Mar '11

12 Mar '11

Since addresses in the ip6.arpa domain are longer than HOSTLEN characters, use a larger maximum length in the resolver code. --- src/res.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/res.c b/src/res.c index dfda0ee..b4cad3b 100644 --- a/src/res.c +++ b/src/res.c @@ -56,6 +56,8 @@ #define TTL_SIZE 4 #define DLEN_SIZE 2 +#define RES_HOSTLEN 127 /* big enough to handle addresses in in6.arpa */ + extern int dn_expand(char *, char *, char *, char *, int); extern int dn_skipname(char *, char *); extern int @@ -68,7 +70,7 @@ extern int errno, h_errno; extern int highest_fd; extern aClient *local[]; -static char hostbuf[HOSTLEN + 1]; +static char hostbuf[RES_HOSTLEN + 1]; static int incache = 0; static CacheTable hashtable[ARES_CACSIZE]; static ResHash idcphashtable[ARES_IDCACSIZE]; @@ -501,10 +503,10 @@ struct hostent *gethost_byaddr(char *addr, Link *lp) static int do_query_name(Link *lp, char *name, ResRQ * rptr) { - char hname[HOSTLEN + 1]; + char hname[RES_HOSTLEN + 1]; int len; - strncpyzt(hname, name, HOSTLEN); + strncpyzt(hname, name, RES_HOSTLEN); len = strlen(hname); if (rptr && !strchr(hname, '.') && _res.options & RES_DEFNAMES) @@ -628,7 +630,7 @@ static void resend_query(ResRQ * rptr) int arpa_to_ip(char *arpastring, unsigned int *saddr) { int idx = 0, onum = 0; - char ipbuf[HOSTLEN + 1]; + char ipbuf[RES_HOSTLEN + 1]; char *fragptr[4]; u_char *ipptr; @@ -671,7 +673,7 @@ int arpa_to_ip(char *arpastring, unsigned int *saddr) #define MAX_ACCEPTABLE_ANS 10 -static char acceptable_answers[MAX_ACCEPTABLE_ANS][HOSTLEN + 1]; +static char acceptable_answers[MAX_ACCEPTABLE_ANS][RES_HOSTLEN + 1]; static int num_acc_answers = 0; #define add_acceptable_answer(x) do { \ @@ -691,7 +693,7 @@ static inline char *is_acceptable_answer(char *h) } #ifdef DNS_ANS_DEBUG_MAX -static char dhostbuf[HOSTLEN + 1]; +static char dhostbuf[RES_HOSTLEN + 1]; #endif /* process name server reply. */ @@ -736,9 +738,9 @@ static int proc_answer(ResRQ * rptr, HEADER *hptr, char *buf, char *eob) else { int strangeness = 0; - char tmphost[HOSTLEN]; + char tmphost[RES_HOSTLEN]; - hostbuf[HOSTLEN] = '\0'; + hostbuf[RES_HOSTLEN] = '\0'; cp += n; type = (int) _getshort(cp); cp += TYPE_SIZE; @@ -798,7 +800,7 @@ static int proc_answer(ResRQ * rptr, HEADER *hptr, char *buf, char *eob) while (hptr->ancount-- > 0 && cp && cp < eob) { n = dn_expand(buf, eob, cp, hostbuf, sizeof(hostbuf)-1); - hostbuf[HOSTLEN] = '\0'; + hostbuf[RES_HOSTLEN] = '\0'; if (n <= 0) break; @@ -826,7 +828,7 @@ static int proc_answer(ResRQ * rptr, HEADER *hptr, char *buf, char *eob) { strncpy(hostbuf, _res.defdname, sizeof(hostbuf) - 1 - len); - hostbuf[HOSTLEN] = '\0'; + hostbuf[RES_HOSTLEN] = '\0'; len = MIN(len + strlen(_res.defdname), sizeof(hostbuf)) - 1; } @@ -954,7 +956,7 @@ static int proc_answer(ResRQ * rptr, HEADER *hptr, char *buf, char *eob) * dn_expand also guarantee buffer is terminated with * null byte? Lets not take chances. -Dianora */ - hostbuf[HOSTLEN] = '\0'; + hostbuf[RES_HOSTLEN] = '\0'; cp += n; len = strlen(hostbuf); @@ -1070,7 +1072,7 @@ static int proc_answer(ResRQ * rptr, HEADER *hptr, char *buf, char *eob) break; } - hostbuf[HOSTLEN] = '\0'; + hostbuf[RES_HOSTLEN] = '\0'; cp += n; add_acceptable_answer(hostbuf); -- 1.7.2.3

1 3

[PATCH 1/4] Make clones.c support non-IPv4 addresses.
by Ned T. Crigler 10 Mar '11

10 Mar '11

The code that detects clones based on the full IP address will work for non-IPv4 addresses now. Based on mamikk's old patch. --- src/clones.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/clones.c b/src/clones.c index e929f70..63e9fb1 100644 --- a/src/clones.c +++ b/src/clones.c @@ -94,14 +94,20 @@ get_clones(aClient *cptr, CloneEnt **ceip, CloneEnt **ce24, int create) char ip24[HOSTIPLEN+1]; char *s; - strcpy(ip24, cptr->hostip); - /* deliberate core if strrchr fails -- we need a valid IP string */ - s = strrchr(ip24, '.'); - *++s = '*'; - *++s = 0; + if (cptr->ip_family == AF_INET) + { + strcpy(ip24, cptr->hostip); + /* deliberate core if strrchr fails -- we need a valid IP string */ + s = strrchr(ip24, '.'); + *++s = '*'; + *++s = 0; + } *ceip = get_clone(cptr->hostip, create); - *ce24 = get_clone(ip24, create); + if (cptr->ip_family == AF_INET) + *ce24 = get_clone(ip24, create); + else + *ce24 = NULL; } static int @@ -274,9 +280,7 @@ clones_add(aClient *cptr) CloneEnt *ceip; CloneEnt *ce24; - if (cptr->ip_family != AF_INET) - return; - if (cptr->ip.ip4.s_addr == 0) + if (cptr->ip_family == AF_INET && cptr->ip.ip4.s_addr == 0) return; get_clones(cptr, &ceip, &ce24, 1); @@ -288,12 +292,14 @@ clones_add(aClient *cptr) ceip->clients = cptr; ceip->gcount++; - ce24->gcount++; + if (ce24) + ce24->gcount++; if (MyConnect(cptr)) { ceip->lcount++; - ce24->lcount++; + if (ce24) + ce24->lcount++; } } @@ -306,9 +312,7 @@ clones_remove(aClient *cptr) CloneEnt *ceip; CloneEnt *ce24; - if (cptr->ip_family != AF_INET) - return; - if (cptr->ip.ip4.s_addr == 0) + if (cptr->ip_family == AF_INET && cptr->ip.ip4.s_addr == 0) return; get_clones(cptr, &ceip, &ce24, 0); @@ -321,17 +325,20 @@ clones_remove(aClient *cptr) ceip->clients = cptr->clone.next; ceip->gcount--; - ce24->gcount--; + if (ce24) + ce24->gcount--; /* !$%#&*%@ user state handling! */ if (cptr->uplink == &me) { ceip->lcount--; - ce24->lcount--; + if (ce24) + ce24->lcount--; } expire_clone(ceip); - expire_clone(ce24); + if (ce24) + expire_clone(ce24); } #endif /* THROTTLE_ENABLE */ -- 1.7.2.3

1 3

[PATCH 1/3] Move zero IP checking into clones_add/clones_remove.
by Ned T. Crigler 07 Mar '11

07 Mar '11

The callers of clones_add and clone_remove were directly accessing the client's IP address. Move this checking into the two functions, to make it easier to change later. --- src/clones.c | 6 ++++++ src/s_misc.c | 6 ++---- src/s_user.c | 6 ++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/clones.c b/src/clones.c index 1c63914..f4d6fc2 100644 --- a/src/clones.c +++ b/src/clones.c @@ -274,6 +274,9 @@ clones_add(aClient *cptr) CloneEnt *ceip; CloneEnt *ce24; + if (cptr->ip.s_addr == 0) + return; + get_clones(cptr, &ceip, &ce24, 1); cptr->clone.prev = NULL; @@ -301,6 +304,9 @@ clones_remove(aClient *cptr) CloneEnt *ceip; CloneEnt *ce24; + if (cptr->ip.s_addr == 0) + return; + get_clones(cptr, &ceip, &ce24, 0); if (cptr->clone.next) diff --git a/src/s_misc.c b/src/s_misc.c index 39108c5..4114fd5 100644 --- a/src/s_misc.c +++ b/src/s_misc.c @@ -363,8 +363,7 @@ exit_one_client_in_split(aClient *cptr, aClient *dead, char *reason) if (cptr->user->alias) cptr->user->alias->client = NULL; - if (cptr->ip.s_addr) - clones_remove(cptr); + clones_remove(cptr); #ifdef RWHO_PROBABILITY probability_remove(cptr); @@ -763,8 +762,7 @@ exit_one_client(aClient *cptr, aClient *sptr, aClient *from, char *comment) while ((lp = sptr->user->channel)) remove_user_from_channel(sptr, lp->value.chptr); - if (sptr->ip.s_addr) - clones_remove(sptr); + clones_remove(sptr); #ifdef RWHO_PROBABILITY probability_remove(sptr); diff --git a/src/s_user.c b/src/s_user.c index c9d89d0..3d3cf34 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -1003,16 +1003,14 @@ register_user(aClient *cptr, aClient *sptr, char *nick, char *username) } /* do this late because of oper masking */ - if (sptr->ip.s_addr) - clones_add(sptr); + clones_add(sptr); } else if (IsServer(cptr)) { aClient *acptr; /* do this early because exit_client() calls clones_remove() */ - if (sptr->ip.s_addr) - clones_add(sptr); + clones_add(sptr); if ((acptr = find_server(user->server, NULL)) && acptr->from != sptr->from) -- 1.7.2.3

1 2

[PATCH] Add NICKIPSTR capability.
by Ned T. Crigler 06 Mar '11

06 Mar '11

Previously, the IP address for a client was sent to other servers as a 32-bit number. This patch adds a new capability that indicates that a server is capable of handling the IP address being sent as a string. --- include/inet.h | 4 ++++ include/struct.h | 3 +++ src/m_nick.c | 9 +++++---- src/m_server.c | 27 +++++++++++++++++++-------- src/s_serv.c | 2 ++ src/s_user.c | 35 ++++++++++++++++++++++++----------- 6 files changed, 57 insertions(+), 23 deletions(-) diff --git a/include/inet.h b/include/inet.h index 7c93613..a0960f7 100644 --- a/include/inet.h +++ b/include/inet.h @@ -36,6 +36,8 @@ extern __u_l inet_makeaddr(int, int); extern __u_l inet_network(char *); extern __u_l inet_lnaof(struct in_addr); extern __u_l inet_netof(struct in_addr); +extern int inet_pton(int, const char *, void *); +extern const char *inet_ntop(int, const void *, char *, socklen_t); #else extern __u_l inet_addr(); @@ -47,5 +49,7 @@ extern __u_l inet_makeaddr(); extern __u_l inet_network(); extern __u_l inet_lnaof(); extern __u_l inet_netof(); +extern int inet_pton(); +extern const char *inet_ntop(); #undef __u_l diff --git a/include/struct.h b/include/struct.h index 255c112..307826c 100644 --- a/include/struct.h +++ b/include/struct.h @@ -251,6 +251,7 @@ typedef struct SAliasInfo AliasInfo; #ifdef NOQUIT #define CAPAB_NOQUIT 0x0040 /* noquit support */ #endif +#define CAPAB_NICKIPSTR 0x0080 /* Nick IP as a string support */ #define SetDKEY(x) ((x)->capabilities |= CAPAB_DKEY) @@ -275,6 +276,8 @@ typedef struct SAliasInfo AliasInfo; #define IsNoquit(x) ((x)->capabilities & CAPAB_NOQUIT) #endif +#define SetNickIPStr(x) ((x)->capabilities |= CAPAB_NICKIPSTR) +#define IsNickIPStr(x) ((x)->capabilities & CAPAB_NICKIPSTR) /* flag macros. */ #define IsULine(x) ((x)->flags & FLAGS_ULINE) diff --git a/src/m_nick.c b/src/m_nick.c index cfa0250..2e2ad07 100644 --- a/src/m_nick.c +++ b/src/m_nick.c @@ -34,7 +34,7 @@ #include "hooks.h" extern int do_user(char *, aClient *, aClient *, char *, char *, char *, - unsigned long, unsigned int, char *); + unsigned long, char *, char *); extern int register_user(aClient *, aClient *, char *, char *); extern int del_dccallow(aClient *, aClient *, int); @@ -431,12 +431,13 @@ int m_nick(aClient *cptr, aClient *sptr, int parc, char *parv[]) if (parc==10) { return do_user(nick, cptr, sptr, parv[5], parv[6], - parv[7], strtoul(parv[8], NULL, 0), 0, parv[9]); + parv[7], strtoul(parv[8], NULL, 0), + "0.0.0.0", parv[9]); } else if (parc==11) { return do_user(nick, cptr, sptr, parv[5], parv[6], parv[7], - strtoul(parv[8], NULL, 0), - strtoul(parv[9], NULL, 0), parv[10]); + strtoul(parv[8], NULL, 0), + parv[9], parv[10]); } } } diff --git a/src/m_server.c b/src/m_server.c index 85e89bf..76dfab3 100644 --- a/src/m_server.c +++ b/src/m_server.c @@ -48,11 +48,22 @@ static void sendnick_TS(aClient *cptr, aClient *acptr) ubuf[0] = '+'; ubuf[1] = '\0'; } - sendto_one(cptr, "NICK %s %d %ld %s %s %s %s %lu %u :%s", - acptr->name, acptr->hopcount + 1, acptr->tsinfo, ubuf, - acptr->user->username, acptr->user->host, - acptr->user->server, acptr->user->servicestamp, - htonl(acptr->ip.s_addr), acptr->info); + if (IsNickIPStr(cptr)) + { + sendto_one(cptr, "NICK %s %d %ld %s %s %s %s %lu %s :%s", + acptr->name, acptr->hopcount + 1, acptr->tsinfo, ubuf, + acptr->user->username, acptr->user->host, + acptr->user->server, acptr->user->servicestamp, + inetntoa((char *)&acptr->ip), acptr->info); + } + else + { + sendto_one(cptr, "NICK %s %d %ld %s %s %s %s %lu %u :%s", + acptr->name, acptr->hopcount + 1, acptr->tsinfo, ubuf, + acptr->user->username, acptr->user->host, + acptr->user->server, acptr->user->servicestamp, + htonl(acptr->ip.s_addr), acptr->info); + } } } @@ -378,12 +389,12 @@ m_server_estab(aClient *cptr) #ifdef HAVE_ENCRYPTION_ON if(!WantDKEY(cptr)) sendto_one(cptr, "CAPAB SSJOIN NOQUIT BURST UNCONNECT ZIP " - "NICKIP TSMODE"); + "NICKIP NICKIPSTR TSMODE"); else sendto_one(cptr, "CAPAB SSJOIN NOQUIT BURST UNCONNECT DKEY " - "ZIP NICKIP TSMODE"); + "ZIP NICKIP NICKIPSTR TSMODE"); #else - sendto_one(cptr, "CAPAB SSJOIN NOQUIT BURST UNCONNECT ZIP NICKIP TSMODE"); + sendto_one(cptr, "CAPAB SSJOIN NOQUIT BURST UNCONNECT ZIP NICKIP NICKIPSTR TSMODE"); #endif sendto_one(cptr, "SERVER %s 1 :%s", diff --git a/src/s_serv.c b/src/s_serv.c index 22c0cef..c8de173 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -2399,6 +2399,8 @@ m_capab(aClient *cptr, aClient *sptr, int parc, char *parv[]) else if (strcmp(parv[i], "NOQUIT") == 0) SetNoquit(cptr); #endif + else if (strcmp(parv[i], "NICKIPSTR") == 0) + SetNickIPStr(cptr); } return 0; diff --git a/src/s_user.c b/src/s_user.c index 7c59d41..06b246e 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -39,6 +39,7 @@ #include "userban.h" #include "hooks.h" #include "memcount.h" +#include "inet.h" #if defined( HAVE_STRING_H) #include <string.h> @@ -47,7 +48,7 @@ #endif int do_user(char *, aClient *, aClient *, char *, char *, char *, - unsigned long, unsigned int, char *); + unsigned long, char *, char *); extern char motd_last_changed_date[]; extern int send_motd(aClient *, aClient *, int, char **); extern void send_topic_burst(aClient *); @@ -1068,12 +1069,23 @@ register_user(aClient *cptr, aClient *sptr, char *nick, char *username) ubuf[1] = '\0'; } hash_check_watch(sptr, RPL_LOGON); - sendto_serv_butone(cptr, "NICK %s %d %ld %s %s %s %s %lu %u :%s", - nick, sptr->hopcount + 1, sptr->tsinfo, ubuf, - user->username, user->host, user->server, - sptr->user->servicestamp, - htonl(sptr->ip.s_addr), sptr->info); - + if (IsNickIPStr(cptr)) + { + sendto_serv_butone(cptr, "NICK %s %d %ld %s %s %s %s %lu %s :%s", + nick, sptr->hopcount + 1, sptr->tsinfo, ubuf, + user->username, user->host, user->server, + sptr->user->servicestamp, + inetntoa((char *)&sptr->ip), sptr->info); + } + else + { + sendto_serv_butone(cptr, "NICK %s %d %ld %s %s %s %s %lu %u :%s", + nick, sptr->hopcount + 1, sptr->tsinfo, ubuf, + user->username, user->host, user->server, + sptr->user->servicestamp, + htonl(sptr->ip.s_addr), sptr->info); + } + if(MyClient(sptr)) { /* if the I:line doesn't have a password and the user does @@ -2088,7 +2100,7 @@ m_user(aClient *cptr, aClient *sptr, int parc, char *parv[]) /* do_user */ int do_user(char *nick, aClient *cptr, aClient *sptr, char *username, char *host, - char *server, unsigned long serviceid, unsigned int ip, char *realname) + char *server, unsigned long serviceid, char *ip, char *realname) { anUser *user; @@ -2137,13 +2149,14 @@ do_user(char *nick, aClient *cptr, aClient *sptr, char *username, char *host, sptr->user->servicestamp = serviceid; if (!MyConnect(sptr)) { - sptr->ip.s_addr=ntohl(ip); - + if (inet_pton(AF_INET, ip, &sptr->ip) == 0) + sptr->ip.s_addr = ntohl(strtoul(ip, NULL, 10)); + /* add non-local clients to the throttle checker. obviously, we only * do this for REMOTE clients!@$$@! throttle_check() is called * elsewhere for the locals! -wd */ #ifdef THROTTLE_ENABLE - if (ip != 0) + if (sptr->ip.s_addr != 0) throttle_check(inetntoa((char *)&sptr->ip), -1, sptr->tsinfo); #endif } -- 1.7.2.3

1 0