Rework server.ini parsing to not depend on the real console #1659
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The commands under the Server group are only meant for server.ini files and aren't usable anywhere else. Similarly, server.ini files aren't supposed to call any other console commands. This is now enforced by not handling the server settings as real commands, but with a new dedicated server.ini parser that handles only server settings and nothing else. This new parser intentionally doesn't support some obscure features of the full console, such as spaces as command group/name separators (e. g. "Server Status" instead of "Server.Status") and console variables. This is strictly speaking a breaking change, but unlikely to cause issues - these features were never documented and are unused in practice.
This is now in pnNcEncrypt.cpp.
Hoikas
reviewed
Feb 1, 2025
| ST::string Parse(const plFileName& fileName); | ||
| void Apply(); | ||
|
|
||
| static ST::string Load(const plFileName& fileName); |
There was a problem hiding this comment.
I have a preference for returning a boolean status value and having the error string fetch being a separate call.
There was a problem hiding this comment.
Would a boolean return and an out parameter for the error message be okay too?
static bool Load(const plFileName& fileName, ST::string& errorMsg);pfServerIni::Load is a static method and I would rather not introduce a new global "last error" variable just for this one call...
Use the methods FromData_BE and FromData_LE instead, which make the endianness explicit (or rather, more explicit than an unnamed bool parameter with a default value).
dgelessus
force-pushed
the
server_ini_parsing
branch
from
8080b72 to
6f31c4a
Compare
dgelessus
force-pushed
the
server_ini_parsing
branch
from
ad7788f to
c54e52e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reworks how server.ini files are parsed, based on my console parsing refactoring in #1459. Advantages of this reworked code include:
Also includes some bonus refactoring of how the Diffie-Hellman keys are stored and passed around.
Example of the new error messages: