Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nixcloud/ip2unix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1.0
Choose a base ref
...
head repository: nixcloud/ip2unix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.1.1
Choose a head ref
  • 7 commits
  • 9 files changed
  • 2 contributors

Commits on Aug 20, 2019

  1. release.nix: Fix build for NixOS 19.03 and newer

    Since NixOS/nixpkgs@340dd80, meson no
    longer propagates the Python dependency, so for our minimal
    configurations we still need to add Python to the list of
    nativeBuildInputs.
    
    I haven't actually noticed this so far because I actually forgot to bump
    the Hydra jobset to 19.03 for quite a while and soon I'll probably
    forget to bump it to 19.09, let's see... ;-)
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    54d96bb View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2019

  1. Rename socketPath rule file option to just "path"

    The rule file options were defined earlier than the rule specification
    options (via the -r command line flag) and when designing the rule
    specification format, I tried to keep options as short as possible.
    
    Unfortunately, this introduced inconsistencies between the naming of
    options in both rule formats and the major offender is "socketPath" in
    the rule file, where it is just "path" via the command line argument.
    
    So when renaming, I didn't remove the old option but rather print a
    deprecation warning instead to make sure we don't immediately break
    things for users.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Sep 14, 2019
    Configuration menu
    Copy the full SHA
    57dae40 View commit details
    Browse the repository at this point in the history
  2. Rename socketActivation rule file option as well

    In the previous commit, we renamed the socketPath option to reduce
    differences between rule specifications via command line and options in
    the rule file.
    
    Another option is "socketActivation", which is just called "systemd" in
    the CLI specification.
    
    The name/semantics of this option however might still be subject to
    change, depending on how we are going to rename the fdName option,
    because setting eg. fdName to "foo" is equivalent to "systemd=foo" in
    the CLI specification.
    
    One example where we'd need to touch the "systemd" option again is if
    we'll end up with nested options like this:
    
      systemd:
        enable: true
        fdName: foo
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Sep 14, 2019
    Configuration menu
    Copy the full SHA
    e689623 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2019

  1. Merge pull request #4 from nixcloud/rulefile-unification

    Unify CLI rule specification options with rule file options
    qknight authored Sep 15, 2019
    Configuration menu
    Copy the full SHA
    31fa1ab View commit details
    Browse the repository at this point in the history
  2. Revert merge of PR #4 (rulefile unification)

    This reverts commit 31fa1ab, reversing
    changes made to 54d96bb.
    
    The changes here were NOT intended to be merged into master, because
    they're for the next minor version and there are still open questions as
    detailed in the pull request.
    
    Furthermore, I intended to merge this alongside the next release so the
    README stays consistent with its implementation.
    aszlig committed Sep 15, 2019
    Configuration menu
    Copy the full SHA
    187b493 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2019

  1. Fix segfault if sockaddr buffers are NULL

    For example something like accept(fd, NULL, NULL) is perfectly valid and
    it's actually the most obvious case when writing a very simple socket
    client or server in C and you're not interested in the peer address.
    
    It turns out that actually very few services in the wild are doing this
    and they usually always pass the buffers for the peer address.
    
    However, this is not the case for something like Boost.Asio and we will
    segfault to death due to a null pointer dereference.
    
    The reason why we didn't catch this earlier is that we're using Python
    to test our implementation, which *always* passes those buffers to
    accept (or accept4 to be more exact).
    
    Now the problem is that it's not very easy to use accept(fd, NULL, NULL)
    in Python, so I decided to add a small helper in C++ to our tests for
    that. This messes up our test hierarchy a little bit, but we need to
    clean up this mess someday anyway, so let's load another trash bag on
    it... X-/
    
    Nevertheless, the most important thing here is that we now also have a
    test that covers this case, so embarrassing bugs like this one won't
    happen again.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    ab25ef5 View commit details
    Browse the repository at this point in the history
  2. Bump version to 2.1.1

    Tests are all still passing and this is an important hotfix release, so
    even thout it only contains one little fix I still consider this
    necessary to release it as soon as possible.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    78c6dcd View commit details
    Browse the repository at this point in the history
Loading