The NetBSD Project

CVS log for src/usr.sbin/inetd/parse_v2.c

[BACK] Up to [cvs.NetBSD.org] / src / usr.sbin / inetd

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.7.2.1: download - view: text, markup, annotated - select for diffs
Wed Nov 4 23:28:50 2026 UTC (11 days, 12 hours ago) by perseant
Branches: perseant-exfatfs
Diff to: previous 1.7: preferred, colored; next MAIN 1.8: preferred, colored
Changes since revision 1.7: +42 -2 lines
Sync with HEAD

Revision 1.7.4.1: download - view: text, markup, annotated - select for diffs
Mon May 18 16:58:48 2026 UTC (5 months, 4 weeks ago) by martin
Branches: netbsd-11
CVS tags: netbsd-11-1-RELEASE, netbsd-11-0-RELEASE, netbsd-11-0-RC7, netbsd-11-0-RC6, netbsd-11-0-RC5
Diff to: previous 1.7: preferred, colored; next MAIN 1.8: preferred, colored
Changes since revision 1.7: +42 -2 lines
Pull up following revision(s) (requested by riastradh in ticket #290):

	usr.sbin/inetd/inetd.h: revision 1.7
	usr.sbin/inetd/inetd.h: revision 1.8
	usr.sbin/inetd/inetd.c: revision 1.142
	tests/usr.sbin/inetd/Makefile: revision 1.3
	usr.sbin/inetd/parse_v2.c: revision 1.8
	usr.sbin/inetd/inetd.8: revision 1.69
	tests/usr.sbin/inetd/t_accept_max.sh: revision 1.1
	tests/usr.sbin/inetd/t_accept_max.sh: revision 1.2
	distrib/sets/lists/tests/mi: revision 1.1418
	usr.sbin/inetd/parse.c: revision 1.6

	(all via patch)

Fix various typos in comments.

Add an optional accept limit to stream/nowait services.
Old syntax:
           socket-type[,accept-max][:accept-filter]
New syntax adds the option:
     accept_max    Equivalent to accept-max in positional notation.
accept_max is a positive integer. inetd will stop accepting new
connections for a service, when the number of running and
waited for instances reaches that number. Further connection
attempts will be queued by the kernel and eventually time
out.

The limit acts in parallel to the wait maximum (default 40). If
you want more than 40 instances being spawned, you also need to
adjust the wait maximum to a higher value.

inetd(8): Add a test case for accept-max.
PR bin/59645: inetd `rate-limiting' algorithm is stupid

inetd(8): Fix some tyupos in previous.
PR bin/59645: inetd `rate-limiting' algorithm is stupid

Revision 1.8: download - view: text, markup, annotated - select for diffs
Sat Dec 27 08:06:38 2025 UTC (10 months, 2 weeks ago) by mlelstv
Branches: MAIN
CVS tags: perseant-exfatfs-base-20261102, HEAD
Diff to: previous 1.7: preferred, colored
Changes since revision 1.7: +42 -2 lines
Add an optional accept limit to stream/nowait services.

Old syntax:

           socket-type[,accept-max][:accept-filter]

New syntax adds the option:

     accept_max    Equivalent to accept-max in positional notation.

accept_max is a positive integer. inetd will stop accepting new
connections for a service, when the number of running and
waited for instances reaches that number. Further connection
attempts will be queued by the kernel and eventually time
out.

The limit acts in parallel to the wait maximum (default 40). If
you want more than 40 instances being spawned, you also need to
adjust the wait maximum to a higher value.

Revision 1.7: download - view: text, markup, annotated - select for diffs
Thu Feb 8 20:51:25 2024 UTC (2 years, 9 months ago) by andvar
Branches: MAIN
CVS tags: perseant-exfatfs-base-20250801, perseant-exfatfs-base-20240630, perseant-exfatfs-base, netbsd-11-base, netbsd-11-0-RC4, netbsd-11-0-RC3, netbsd-11-0-RC2, netbsd-11-0-RC1
Branch point for: perseant-exfatfs, netbsd-11
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +3 -3 lines
fix misplaced or missing "e" in words with "ment" ending (argument, implement,
increment, decrement, alignment), in comments, documentation, log messages.

Revision 1.6: download - view: text, markup, annotated - select for diffs
Tue Oct 12 19:08:04 2021 UTC (5 years, 1 month ago) by christos
Branches: MAIN
CVS tags: netbsd-10-base, netbsd-10-2-RELEASE, netbsd-10-1-RELEASE, netbsd-10-0-RELEASE, netbsd-10-0-RC6, netbsd-10-0-RC5, netbsd-10-0-RC4, netbsd-10-0-RC3, netbsd-10-0-RC2, netbsd-10-0-RC1, netbsd-10
Diff to: previous 1.5: preferred, colored
Changes since revision 1.5: +4 -5 lines
PR/56448: Solomon Ritzow: Various improvements.

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
defined in.

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()".

Revision 1.5: download - view: text, markup, annotated - select for diffs
Fri Sep 3 20:24:28 2021 UTC (5 years, 2 months ago) by rillig
Branches: MAIN
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +8 -8 lines
inetd: prepare for lint's strict bool mode

Lint's strict bool mode considers bool incompatible with the other
scalar types.  This makes the type of expressions more visible in the
code.  In particular, conditions of the form '!strcmp(...)' are no
longer allowed, they have to be written as 'strcmp(...) == 0'.

The operator '!' cannot be used with sep->se_wait since that has type
pid_t, not bool.

No change to the resulting binary.

Revision 1.4: download - view: text, markup, annotated - select for diffs
Mon Aug 30 18:21:11 2021 UTC (5 years, 2 months ago) by rillig
Branches: MAIN
Diff to: previous 1.3: preferred, colored
Changes since revision 1.3: +11 -13 lines
inetd: raise WARNS from 5 to 6

The necessary fixes include:
* explicit integer conversions, to get rid of mixed signedness
* function prototypes for parameterless functions

While here:
* add space after comma
* add space after 'if'
* place the '{' of a function definition on a separate line
* rename variables 'bits' and 'temp' to 'hi' and 'lo'
* in parse_quote, prefer expressions over assignments
* make hex_to_bits static

No functional change.

Revision 1.3: download - view: text, markup, annotated - select for diffs
Mon Aug 30 17:32:23 2021 UTC (5 years, 2 months ago) by rillig
Branches: MAIN
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +83 -83 lines
inetd: remove trailing whitespace

Revision 1.2: download - view: text, markup, annotated - select for diffs
Mon Aug 30 06:27:49 2021 UTC (5 years, 2 months ago) by tih
Branches: MAIN
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +5 -5 lines
Summary: char is unsigned on arm, so use int when -1 indicates error

hex_to_bits() returns -1 on error, so declare it int, and do the same
for the variables that hold intermediate values returned by it.

Revision 1.1: download - view: text, markup, annotated - select for diffs
Sun Aug 29 09:54:18 2021 UTC (5 years, 2 months ago) by christos
Branches: MAIN
Inetd enhancements by James Browning, Gabe Coffland, Alex Gavin, Solomon Ritzow
Described in:
    https://www.mail-archive.com/tech-userlevel@netbsd.org/msg03114.html
And developed in:
    https://github.com/ritzow/src/pull/1

From their notes:

All new functionality should be explained by the updated manpage.

The manpage has been refactored a bit: A new section "Directives"
has been added and the information about default hostnames and
IPsec directives has been moved there, and the new file include
directive information is also there.

getconfigent has the most major changes. A newline is no longer
read immediately, but is called only by a "goto more" (inside an
if(false) block). This allows multiple definitions or directives
to exist on a single line for anything that doesn't terminate using
a newline. This means a key-values service definition can be followed
by another key-values service definition, a positional definition,
or an ipsec, hostname, or .include directive on the same line.

memset is no longer used explicitly to clear the servtab structure,
a function init_servtab() is used instead, which uses a C struct
initializer.

The servtab se_group field is its own allocation now, and not just
a pointer into the user:group string.

Refactored some stuff out of getconfigent to separate functions
for use by parse_v2.c. These functions in inetd.c are named with
the form parse_*()

parse_v2.c only has code for parsing a key-values service definition
into a provided servtab. It should not have anything that affects
global state other than line and line_number.

Some function prototypes, structures, and #defines have been moved
from inetd.c to inetd.h.

The function config_root replaces config as the function called on
a config file load/reload. The code removed from the end of
config(void) is now called in config_root, so it is not run on each
recursive config call.

setconfig(void) was removed and its code added into config_root
because that is the only place it is called, and redundant checks
for non-null globals were removed because they are always freed by
endconfig. The fseek code was also removed because the config files
are always closed by endconfig.

Rate limiting code was updated to add a per-service per-IP rate
limiting form. Some of that code was refactored out of other places
into functions with names in the form rl_*()

We have not added any of the license or version information to the
new files parse_v2.c, parse_v2.h, and inetd.h and we have not
updated the license or version info for inetd.c.

Security related:

The behavior when reading invalid IPsec strings has changed. Inetd
no longer exits, it quits reading the current config file instead.
Could this impact program security?

We have not checked for memory leaks. Solomon tried to use dmalloc
without success. getconfigent seemed to have a memory leak at each
"goto more". It seems like inetd has never free'd allocated strings
when throwing away erroneous service definitions during parsing
(i.e. when "goto more" is called when parsing fields). OpenBSD's
version calls freeconfig on "goto more"
(https://github.com/openbsd/src/blob/c5eae130d6c937080c3d30d124e8c8b86db7d625/usr.sbin/inetd/inetd.c#L1049)
but NetBSD only calls it when service definitions are no longer
needed. This has been fixed. freeconfig is called immediately before
any "goto more". There shouldn't be any time when a servtab is in
an invalid state where freeconfig would break.

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options

CVSweb <webmaster@jp.NetBSD.org>