Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pi-hole FTL v4.2.3 #519

Merged
merged 9 commits into from
Feb 26, 2019
Merged

Pi-hole FTL v4.2.3 #519

merged 9 commits into from
Feb 26, 2019

Commits on Feb 21, 2019

  1. Add an "/FTL-settings" shared memory block 

    Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	shmem.c
    @AzureMarker @DL6ER
    AzureMarker authored and DL6ER committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    3d8e22a View commit details
    Browse the repository at this point in the history

  2. Remap dynamically sized shared memory objects in locker when we detec… 

    …t that at least one of the objects has changed

Signed-off-by: DL6ER <dl6er@dl6er.de>
    @DL6ER
    DL6ER committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    fda4027 View commit details
    Browse the repository at this point in the history

  3. Also remap strings object 

    Signed-off-by: DL6ER <dl6er@dl6er.de>
    @DL6ER
    DL6ER committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    e33b9bc View commit details
    Browse the repository at this point in the history

  4. Use counters to transport information about actual size of shared mem… 

    …ory objects into all running processes, even if they are forks

Signed-off-by: DL6ER <dl6er@dl6er.de>
    @DL6ER
    DL6ER committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    8f82ef3 View commit details
    Browse the repository at this point in the history

  5. Store string_MAX value when resizing + use mremap instead of munmap/mmap 

    Signed-off-by: DL6ER <dl6er@dl6er.de>
    @DL6ER
    DL6ER committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    6ca1c5d View commit details
    Browse the repository at this point in the history

  6. Update global pointers after mremap() might have set the pointers to … 

    …a new virtual address

Signed-off-by: DL6ER <dl6er@dl6er.de>
    @DL6ER
    DL6ER committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    fabfd38 View commit details
    Browse the repository at this point in the history

  7. Only open shared memory object if we also want to truncate it 

    Signed-off-by: DL6ER <dl6er@dl6er.de>
    @DL6ER
    DL6ER committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    cefcbe6 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2019

  1. Store next string position in shared memory settings 

    This was causing an issue because each process had a different value
for the next string position, and caused corruption in the string
shared memory.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
    @AzureMarker
    AzureMarker committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    a0b01dd View commit details
    Browse the repository at this point in the history

  2. Lower shared memory version to 4 

    The version on development is 3, so this version should be 4.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
    @AzureMarker
    AzureMarker committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    a11d3dd View commit details
    Browse the repository at this point in the history