20231026-lwip-tweaks-and-fixes #58
Merged
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
…) to new file Makefile.maintenance; Makefile.maintenance: add lwip-patch-sync clause; src/routes.c: add error checking to meta.connection_count decrement in wolfsentry_route_event_dispatch_0(); src/lwip/packet_filter_glue.c: add action_results and interface ID to WOLFSENTRY_DEBUG_LWIP messages, and add missing gates for LWIP_IPV6 in WOLFSENTRY_DEBUG_LWIP paths; lwip: remove improper tcp_filter_dispatch_incoming(FILT_CLOSED, ...) in ../third/lwip/src/core/tcp_in.c:tcp_process() (FILT_CLOSED should happen only when tcp_free(pcb)); regenerate lwip/LWIP_PACKET_FILTER_API.patch rebased on upstream 5e3268cf3e (Oct 14 2023); wolfsentry/wolfsentry_settings.h: conditionalize definition of WOLFSENTRY_ENT_ID_FMT.
in tcp_filter_with_wolfsentry(), don't set WOLFSENTRY_ROUTE_FLAG_DIRECTION_IN for FILT_REMOTE_RESET, and fix typo "&event" in call to wolfsentry_route_event_dispatch_with_inited_result(); routes.c: in wolfsentry_route_delete_0(), warn if a route with nonzero connection_count is deleted; wolfsentry_route_delete_1(): if the route has a nonzero connection_count, set purge_after and return DEFERRED; wolfsentry_route_event_dispatch_0(): don't increment/decrement counts when WOLFSENTRY_ACTION_RES_FALLTHROUGH; wolfsentry/wolfsentry.h: add WOLFSENTRY_ACTION_RES_CLOSE_WAIT; wolfsentry/wolfsentry_errcodes.h: add WOLFSENTRY_SUCCESS_ID_DEFERRED.
…n benchmark-singlethreaded-test from 120 to 150, and in benchmark-test from 320 to 350, to tolerate jitter. doc/json_configuration.md: update for "max-purgeable-idle-time". lwip/LWIP_PACKET_FILTER_API.patch: clean up TCP FILT_CLOSED callbacks: tcp_filter_dispatch_*() before tcp_pcb_remove() to keep pcb->local_port intact, and pass netif as NULL forcing lookup from pcb->netif_idx, since most FILT_CLOSED events are timer-driven, not traffic-driven. src/actions.c, src/events.c, src/kv.c, src/routes.c: remove incorrect calls to wolfsentry_table_ent_delete_by_id_1() immediately following wolfsentry_table_ent_insert() -- the former is implicit to the latter. src/json/load_config.c: add "max-purgeable-idle-time". wolfsentry/wolfsentry.h: bump version to 1.6.1; add macro WOLFSENTRY_ROUTE_INTERNAL_FLAGS. src/wolfsentry_internal.h: add max_purgeable_idle_time to struct wolfsentry_route_table. src/routes.c: * wolfsentry_route_init_by_exports(): clear WOLFSENTRY_ROUTE_INTERNAL_FLAGS from route_exports->flags. * wolfsentry_route_init_by_exports(): fix pointer math in memset() clause to correctly treat route_exports->private_data_size as a byte count. * wolfsentry_route_new_by_exports(): fix check on route_exports->private_data_size. * wolfsentry_route_insert_1(), wolfsentry_route_insert_2(), and wolfsentry_route_insert_by_exports_2: add logic to return WOLFSENTRY_SUCCESS_ID_ALREADY_OK when inserting a duplicate route when existing one has WOLFSENTRY_ROUTE_FLAG_PENDING_DELETE (which is cleared, alongside updating meta.purge_after). * wolfsentry_route_insert_into_table(), wolfsentry_route_insert_into_table_and_check_out(), wolfsentry_route_delete_from_table(), wolfsentry_route_event_dispatch_1(), wolfsentry_route_stale_purge_1(): accept null table arg to represent wolfsentry->routes thread-safely. * wolfsentry_route_insert_by_exports(): add implementation. * wolfsentry_route_table_max_purgeable_idle_time_get(), wolfsentry_route_table_max_purgeable_idle_time_set(), and wolfsentry_route_purge_time_set(): add implementations. * wolfsentry_route_delete_0(): add defer_p argument, activating logic (relocated and revised from wolfsentry_route_delete_1()) in which a deletion request for a route with nonzero connection_count sets its WOLFSENTRY_ROUTE_FLAG_PENDING_DELETE and returns WOLFSENTRY_SUCCESS_ID_DEFERRED. src/wolfsentry_internal.c: in wolfsentry_table_ent_delete_by_id_1(), add check that ent->id is valid, and add opportunistic logic to reclaim just-allocated ID. tests/test-config.json and tests/test-config-numeric.json: add "max-purgeable-idle-time" clauses. tests/unittests.c: add to test_json a workout of connection_count dynamics. doc/wolfSentry_refman.pdf: regenerate.
|
Disregard. I thought it was trying to apply the lwip patches onto ../third/lwip but looks like it's trying to do the opposite and create the patches. |
lealem47
previously approved these changes
Nov 13, 2023
…SENTRY_MEMALIGN_1() when .route_private_data_alignment is nonzero; Makefile.analyzers: add sanitize-all-NO_POSIX_MEMALIGN-gcc; tweak notification-demo-build-test to explicitly use the master branch of wolfssl.
lealem47
approved these changes
Nov 13, 2023
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.
Makefile: move maintainer-only clauses (release, com-bundle, doc-sync) to new fileMakefile.maintenance;Makefile.maintenance: addlwip-patch-syncclause;src/routes.c: add error checking tometa.connection_count decrementinwolfsentry_route_event_dispatch_0();src/lwip/packet_filter_glue.c: addaction_resultsand interface ID toWOLFSENTRY_DEBUG_LWIPmessages, and add missing gates forLWIP_IPV6inWOLFSENTRY_DEBUG_LWIPpaths;lwip: remove improper
tcp_filter_dispatch_incoming(FILT_CLOSED, ...)in../third/lwip/src/core/tcp_in.c:tcp_process()(FILT_CLOSEDshould happen only whentcp_free(pcb));regenerate
lwip/LWIP_PACKET_FILTER_API.patchrebased on upstream 5e3268cf3e (Oct 14 2023);wolfsentry/wolfsentry_settings.h: conditionalize definition ofWOLFSENTRY_ENT_ID_FMT.