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.

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

Mptcp tools #62981

Merged
merged 2 commits into from Jun 27, 2019
Merged

Mptcp tools #62981

merged 2 commits into from Jun 27, 2019

Conversation

teto
Copy link
Member

@teto teto commented Jun 11, 2019

Motivation for this change

One of the pain point of MPTCP is - because it's not upstream yet - it's kinda hard to configure as standard tools may need to be overriden with their MPTCP fork.
Nix makes it easier.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@teto
Copy link
Member Author

teto commented Jun 25, 2019

@layus

@@ -15685,6 +15687,9 @@ in
nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }
else unixtools.nettools;

nettools_mptcp = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools/mptcp.nix { }
else unixtools.nettools;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes little sense as you would rather see nettols_mptcp fail than installing unixtools.nettools without warnings. This is a good fallback for nettols but not for nettols_mptcp

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the if.

@teto
Copy link
Member Author

teto commented Jun 26, 2019

I've bumped the versions for mptcp 0.95. The CI errors are strange though ?

@layus
Copy link
Member

layus commented Jun 26, 2019

The CI errors are strange, but not as much as the build errors I get on 127df2799ba you just force pushed.

nix-build -A iproute_mptcp
these derivations will be built:
  /nix/store/8ckmbsbarvl3y24bckbn1l6ky7qhi6fb-source.drv
  /nix/store/lvm5dh9mn02ndyz6iy57gjfl616f5yw1-iproute_mptcp-0.95.drv
building '/nix/store/8ckmbsbarvl3y24bckbn1l6ky7qhi6fb-source.drv'...

trying https://github.com/multipath-tcp/iproute-mptcp/archive/mptcp_v0.95.tar.gz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100   140    0   140    0     0    642      0 --:--:-- --:--:-- --:--:--   642
100  947k  100  947k    0     0   725k      0  0:00:01  0:00:01 --:--:-- 1053k
unpacking source archive /build/mptcp_v0.95.tar.gz
hash mismatch in fixed-output derivation '/nix/store/j8lrhrhnryw0afvffk99h4rij9ca6ydq-source':
  wanted: sha256:070891hfi9z5y4v28gwnyy934ynnanmbi4mh4cx4zhq2azbhbnzc
  got:    sha256:07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3
cannot build derivation '/nix/store/lvm5dh9mn02ndyz6iy57gjfl616f5yw1-iproute_mptcp-0.95.drv': 1 dependencies couldn't be built
error: build of '/nix/store/lvm5dh9mn02ndyz6iy57gjfl616f5yw1-iproute_mptcp-0.95.drv' failed

pkgs/os-specific/linux/iproute/mptcp.nix Outdated Show resolved Hide resolved
@layus
Copy link
Member

layus commented Jun 26, 2019

With the above change, I could test everything. Seems fine.

teto added 2 commits June 27, 2019 12:00
Adds an -m flag to track MPTCP connection.
allows to disable MPTCP on specific interfaces.
@teto
Copy link
Member Author

teto commented Jun 27, 2019

fixed.

Copy link
Member

@layus layus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM :)

@teto teto merged commit 4259498 into NixOS:master Jun 27, 2019
@teto teto deleted the mptcp_tools branch June 27, 2019 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants