[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
bin/56448: Inetd Refactoring and IP rate limiting improvement
>Synopsis: Inetd Refactoring and IP rate limiting improvement
>Arrival-Date: Fri Oct 08 19:50:00 +0000 2021
>Originator: Solomon Ritzow
I have implemented the changes proposed for usr.sbin/inetd by Christos
Zoulas at https://github.com/ritzow/src/pull/1#issuecomment-907763557.
I have also implemented various minor improvements as well as larger
changes to the IP rate limiting code (which was added to inetd about a
month ago) to reduce memory usage.
Here's some other info about the changes my university senior project
group implemented which Christos Zoulas committed a month ago:
The changes I've made to NetBSD-current can be viewed at
and downloaded from the following URLs:
Comparing the current inetd.c with the new parse.c or the new inetd.c
should produce a pretty clear side-by-side diff. Same with inetd.h.
To compare the new ratelimit.c code, it would be better to copy the old
rate limit code at the bottom of inetd.c (the first function starting
with rl_) into a new file and compare with ratelimit.c.
Rate limiting code has been moved to ratelimit.c. I renamed
clear_ip_list to rl_clear_ip_list and broke the code up into more
functions. I have also made the per-IP rate limiting allocation more
efficient. IP addresses are now stored in their network format instead
of a string from getnameinfo (see inetd.h struct rl_ip_node). malloc
calls use only the space needed by the structure by using offsetof on
union members (I suppose this can be a bit dangerous if not done
correctly...). Per-IP rate limiting still supports textual comparison
using getnameinfo for address families other than AF_INET and AF_INET6, but I
don't think there are any that are actually compatible or used by inetd (I
haven't tested UNIX sockets with a remote bound to another file, but I did test
using IPv6 with the textual format by commenting out the IPv6 specific
code, and it works properly). Still potentially handy for the future.
The IP node list (se_rl_ip_list) now uses the <sys/queue.h> SLIST macros
instead of a custom list. I've broken rl_process up into helper functions
for each type of rate limiting and created a separate function for
address stringification, for use with printouts from the -d flag. I
tried to reduce stack memory use by moving printing code involving
string buffers into separate functions. I haven't tested rl_ipv6_eq on
a 32-bit system.
The code for the positional syntax has also been moved to parse.c.
Function try_biltin has been added to remove parse.c:parse_server's
dependency on the biltin structure definition.
File inetd.h has been updated with the proper function prototypes, and
the servtab structure has been update with the new IP node SLIST. I also
moved things around a bit. The way we (a peer and myself)
formatted inetd.h previously was somewhat confusing. Function and global
variable prototypes are now organized by the source file they are
I also added a -f flag that I saw in another problem report
(https://gnats.netbsd.org/12823) that I thought could be useful. It
runs inetd in the foreground but without debug printouts or SO_DEBUG.
I'm not completely sure about the line "if (foreground) setsid()" that
I changed from "if (debug) setsid()".
Main Index |
Thread Index |