Add MarkOffsetBits to support the qos-scripts to work together #206
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
| @@ -775,6 +778,10 @@ config_read(const char *filename) | |||
| debug(LOG_WARNING, "SSLAllowedCipherList is set but no SSL compiled in. Ignoring!"); | |||
| #endif | |||
| break; | |||
| case oMarkOffsetBits: | |||
| sscanf(p1, "%u", &config.markoffsetbits); | |||
| config.markoffsetbits = config.markoffsetbits > 31 ? 0 : config.markoffsetbits; | |||
There was a problem hiding this comment.
This should log if the value is too large!
* The qos-scripts using 8 bits marks (0x01 - 0xff) for their
classification purpose which it has overlapped with the wifidog
marks.
Therefore, MarkOffsetBits should be specified in the config file
for the proper offset, in this case of the qos-scripts is 8 bits
and the wifidog mark then left shifted as below,
0x1 => 0x100
0x2 => 0x200
0xfe => 0xfe00
The default value of MarkOffsetBits is 0 that is no offset.
* The MarkOffsetBits should be in the range of 0 to 31, the large value should be logged with warning message. Thanks to Michael Haas (mhaas) for comment.
neutronth
force-pushed
the
devel-qos-scripts-work-together
branch
from
dc8c8bc
to
a29ba71
Compare
| if (config.markoffsetbits > 31) { | ||
| config.markoffsetbits = 0; | ||
| debug(LOG_WARNING, "MarkOffsetBits is invalid. It should be in the range of 0 to 31. " | ||
| "Fallback to no offset!"); |
There was a problem hiding this comment.
Invalid configuration should yield a fatal error and exit.
|
Also needed is to update the default template configuration file provided with the new key (commented out) and the details on what is valid, use, defaults and failure mode. Finally, it needs to be rebased. |
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.
The qos-scripts using 8 bits marks (0x01 - 0xff) for their
classification purpose which it has overlapped with the wifidog
marks.
Therefore, MarkOffsetBits should be specified in the config file
for the proper offset, in this case of the qos-scripts is 8 bits
and the wifidog mark then left shifted as below,
0x1 => 0x100
0x2 => 0x200
0xfe => 0xfe00
The default value of MarkOffsetBits is 0 that is no offset.