January 2012 - DALnet-src

[PATCH] Make /who without any flags parse IP addresses and CIDR.
by Ned T. Crigler 29 Jan '12

29 Jan '12

Previously the code for handling /who when not given any flags only checked for a '.' character to distinguish between a hostname and nickname. Use the CIDR parsing code to allow it to parse IP addresses and CIDR too. --- src/m_who.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 51 insertions(+), 6 deletions(-) diff --git a/src/m_who.c b/src/m_who.c index 703dca6..c0dccbd 100644 --- a/src/m_who.c +++ b/src/m_who.c @@ -154,19 +154,64 @@ int build_searchopts(aClient *sptr, int parc, char *parv[]) return 0; } } + else if (IsAnOper(sptr)) + { + int bits; + + bits = inet_parse_cidr(AF_INET, parv[0], + &wsopts.cidr_ip, sizeof(wsopts.cidr_ip)); + if (bits > 0) + { + wsopts.cidr_family = AF_INET; + wsopts.cidr_bits = bits; + wsopts.cidr_plus = 1; + } + else + { + bits = inet_parse_cidr(AF_INET6, parv[0], + &wsopts.cidr_ip, sizeof(wsopts.cidr_ip)); + if (bits > 0) + { + wsopts.cidr_family = AF_INET6; + wsopts.cidr_bits = bits; + wsopts.cidr_plus = 1; + } + else + { + /* + * The argument could be an IPv6 address with a wildcard, a + * hostname, or a nickname. + */ + if (strchr(parv[0], ':')) + { + wsopts.ip_plus = 1; + wsopts.ip = parv[0]; + } + else if (strchr(parv[0], '.')) + { + wsopts.host_plus = 1; + wsopts.host = parv[0]; + } + else + { + wsopts.nick_plus = 1; + wsopts.nick = parv[0]; + } + } + } + } else { - /* If the arguement has a . in it, treat it as an - * address. Otherwise treat it as a nick. -Rak */ + /* The argument could be either a hostname or a nickname. */ if (strchr(parv[0], '.')) { - wsopts.host_plus=1; - wsopts.host=parv[0]; + wsopts.host_plus = 1; + wsopts.host = parv[0]; } else { - wsopts.nick_plus=1; - wsopts.nick=parv[0]; + wsopts.nick_plus = 1; + wsopts.nick = parv[0]; } } return 1; -- 1.7.8.3

1 0

[PATCH] Fix identd connections on FreeBSD.
by Ned T. Crigler 09 Jan '12

09 Jan '12

FreeBSD is apparently stricter than Linux with the address length parameter to the connect system call. The code was using the total length of the buffer (big enough for either an IPv4 or IPv6 address) instead of the exact length depending on the kind of address, which caused FreeBSD to return an error immediately, even though an IPv4 address can still fit in the buffer for an IPv6 address. Fixed by re-using the address length calculated earlier when binding the socket. This was spotted thanks to a user who reported that identd wasn't working for them. --- src/s_auth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/s_auth.c b/src/s_auth.c index 6cf4d81..92c0af7 100644 --- a/src/s_auth.c +++ b/src/s_auth.c @@ -134,7 +134,7 @@ void start_auth(aClient *cptr) } if (connect(cptr->authfd, &sock.sa, - sizeof(sock)) == -1 && errno != EINPROGRESS) + locallen) == -1 && errno != EINPROGRESS) { ircstp->is_abad++; /* No error report from this... */ -- 1.7.7.3

1 0

[PATCH] Fix identd connections on FreeBSD.
by Ned T. Crigler 07 Jan '12

07 Jan '12

FreeBSD is apparently stricter than Linux with the address length parameter to the connect system call. The code was using the total length of the buffer (big enough for either an IPv4 or IPv6 address) instead of the exact length depending on the kind of address, which caused FreeBSD to return an error immediately, even though an IPv4 address can still fit in the buffer for an IPv6 address. Fixed by re-using the address length calculated earlier when binding the socket. This was spotted thanks to a user who reported that identd wasn't working for them. --- src/s_auth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/s_auth.c b/src/s_auth.c index 6cf4d81..92c0af7 100644 --- a/src/s_auth.c +++ b/src/s_auth.c @@ -134,7 +134,7 @@ void start_auth(aClient *cptr) } if (connect(cptr->authfd, &sock.sa, - sizeof(sock)) == -1 && errno != EINPROGRESS) + locallen) == -1 && errno != EINPROGRESS) { ircstp->is_abad++; /* No error report from this... */ -- 1.7.7.3

1 0