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: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 38c28ef10c54
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7b8a7cee7846
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 23, 2019

  1. hostapd: Add noscan mode. 

    Applies OpenWRT's noscan patch to hostapd and the relevant option to
the hostapd module.

This noscan patch adds a new `noscan` option allowing us to create
some overlapping BSSs in HT40+/- mode.

Note: this option is disabled by default, we leave this up to the end
user whether it should be enabled or not.

Not being able to create those overlapping BSSs is basically
preventing us to use 802.11n in any urban area where chances to
overlap with another SSID are extremely high.

The patch we are using is a courtesy of the openwrt team and is
applied to the defaul hostapd package in both OpenWRT and Archlinux.
    @picnoir
    picnoir committed Jun 23, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    brainrake Márton Boros
    GPG key ID: C0D4B398D4F3158F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    98deb87 View commit details

  2. hostapd: starting hostapd systemd service at boot.

    @picnoir
    picnoir committed Jun 23, 2019
    Copy the full SHA
    5121f8d View commit details

Commits on Jun 25, 2019

  1. Merge pull request #63699 from NinjaTrappeur/nin-hostapd-noscan 

    hostapd: add noscan mode
    @grahamc
    grahamc authored Jun 25, 2019
    Copy the full SHA
    7b8a7ce View commit details
Showing with 20 additions and 4 deletions.
  1. +12 −2 nixos/modules/services/networking/hostapd.nix
  2. +8 −2 pkgs/os-specific/linux/hostapd/default.nix
14 changes: 12 additions & 2 deletions nixos/modules/services/networking/hostapd.nix
View file
Original file line number Diff line number Diff line change
@@ -30,10 +30,11 @@ let
ctrl_interface=/run/hostapd
ctrl_interface_group=${cfg.group}
${if cfg.wpa then ''
${optionalString cfg.wpa ''
wpa=2
wpa_passphrase=${cfg.wpaPassphrase}
'' else ""}
''}
${optionalString cfg.noScan "noscan=1"}
${cfg.extraConfig}
'' ;
@@ -69,6 +70,14 @@ in
'';
};

noScan = mkOption {
default = false;
description = ''
Do not scan for overlapping BSSs in HT40+/- mode.
Caution: turning this on will violate regulatory requirements!
'';
};

driver = mkOption {
default = "nl80211";
example = "hostapd";
@@ -162,6 +171,7 @@ in
after = [ "sys-subsystem-net-devices-${escapedInterface}.device" ];
bindsTo = [ "sys-subsystem-net-devices-${escapedInterface}.device" ];
requiredBy = [ "network-link-${cfg.interface}.service" ];
wantedBy = [ "multi-user.target" ];

serviceConfig =
{ ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";
10 changes: 8 additions & 2 deletions pkgs/os-specific/linux/hostapd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:

with stdenv.lib;
stdenv.mkDerivation rec {
let noScanPatch = fetchurl {
url="https://git.telliq.com/gtu/openwrt/raw/master/package/network/services/hostapd/patches/300-noscan.patch";
sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";
};
in stdenv.mkDerivation rec {
name = "hostapd-${version}";
version = "2.8";

@@ -13,6 +17,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libnl openssl sqlite ];

patches = [ noScanPatch ];

outputs = [ "out" "man" ];

extraConfig = ''
@@ -66,7 +72,7 @@ stdenv.mkDerivation rec {
repositories.git = git://w1.fi/hostap.git;
description = "A user space daemon for access point and authentication servers";
license = licenses.gpl2;
maintainers = with maintainers; [ phreedom ];
maintainers = with maintainers; [ phreedom ninjatrappeur ];
platforms = platforms.linux;
};
}