Merge branch 'dev'

misje · Mar 24, 2019 · 09a468b · 09a468b
2 parents 6930316 + 46a2710
commit 09a468b
Show file tree

Hide file tree

Showing 9 changed files with 303 additions and 263 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.4.3 - 2019-03-19
+### Added
+- DHCP option names are printed along with their option codes.
+
+### Changed
+- Debug output is more detailed and aligned.
+
+### Fixed
+- Alignment and explicit data type conversions are used to compile without
+  errors on 32-bit architectures.
+- Do not fail on strict-overflow warnings, as some may be ignored.
+- Do not use non-ASCII characters in debug output. They were not strictly
+  needed.
+
 ## 0.4.2 - 2019-01-17
 ### Changed
 - Change usage string to reflect formatting used by man page.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,36 @@ set(HEADERS
 	)
 add_executable(dhcpoptinj ${SOURCES} ${HEADERS})
 set_property(TARGET dhcpoptinj PROPERTY C_STANDARD 99)
-target_compile_options(dhcpoptinj PRIVATE  -Wall -Wextra -pedantic -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wredundant-decls -Wshadow -Wsign-conversion -Wstrict-overflow=5 -Wswitch-default -Wundef -Werror -Wno-unused -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition -fstack-protector -Wwrite-strings -D_POSIX_SOURCE -D_DEFAULT_SOURCE -D_FORTIFY_SOURCE=2)
+target_compile_options(dhcpoptinj PRIVATE
+	-Wall
+	-Wextra
+	-pedantic
+	-Wcast-align
+	-Wcast-qual
+	-Wdisabled-optimization
+	-Wformat=2
+	-Winit-self
+	-Wlogical-op
+	-Wmissing-declarations
+	-Wmissing-include-dirs
+	-Wredundant-decls
+	-Wshadow
+	-Wsign-conversion
+	-Wstrict-overflow=5
+	-Wno-error=strict-overflow
+	-Wswitch-default
+	-Wundef
+	-Werror
+	-Wno-unused
+	-Wmissing-prototypes
+	-Wstrict-prototypes
+	-Wold-style-definition
+	-fstack-protector
+	-Wwrite-strings
+	-D_POSIX_SOURCE
+	-D_DEFAULT_SOURCE
+	-D_FORTIFY_SOURCE=2
+	)
 
 find_library(NFQ_LIB netfilter_queue REQUIRED)
 target_link_libraries(dhcpoptinj ${NFQ_LIB})

diff --git a/docs/dhcpoptinj.8 b/docs/dhcpoptinj.8
diff --git a/src/config.c b/src/config.c
@@ -252,11 +252,11 @@ static struct Config *createDefaultConfig(void)
 
 static void printUsage(const char *programName)
 {
-	int progNameLen = strlen(programName);
+	int progNameLen = (int)strlen(programName);
 	printf(
 			"%s – DHCP option injector\n"
          "Usage: %s [-df] [--forward-on-fail] [-i|-r] [-p [pid_file]] \n"
-			"       %*s -q queue_num -o dhcp_option [(-o dhcp_option) …]\n"
+			"       %*s -q queue_num -o dhcp_option [(-o dhcp_option) ...]\n"
 			"       %s -h|-v\n"
 			,
 			programName,