add bandwidth as a service option for ppp (l2tp, pppoe)

examples/rotuer.nix

@@ -71,6 +71,7 @@ rec {
         interface = config.hardware.networkInterfaces.wan;
         username = secrets.l2tp.name;
         password = secrets.l2tp.password;
+        bandwidth = 70 * 1000 * 1000;
       };
       # once the wan has ipv4 connnectivity, should we run dhcp6
       # client to potentially get an address range ("prefix

modules/ppp/common.nix

@@ -13,6 +13,7 @@
   username,
   password,
   lcpEcho,
+  bandwidth,
   ppp-options,
   dependencies ? [ ],
 }:
@@ -115,7 +116,7 @@ let
       ${command}
     '';
     notification-fd = 10;
-#    properties.bandwidth = 3 * 1000 * 1000;
+    properties.bandwidth = bandwidth;
     timeout-up =
       if lcpEcho.failure != null then (10 + lcpEcho.failure * lcpEcho.interval) * 1000 else 60 * 1000;
     inherit dependencies;

modules/ppp/default.nix

@@ -56,6 +56,11 @@ in
         default = null;
         description = "password";
       };
+      bandwidth = mkOption {
+        type = types.nullOr (types.int);
+        default = null;
+        description = "approximate bandwidth in bytes/second. Used to calculate rate limits for ICMP";
+      };
       lcpEcho = {
         adaptive = mkOption {
           description = "send LCP echo-request frames only if no traffic was received from the peer since the last echo-request was sent";

modules/ppp/l2tp.nix

@@ -13,6 +13,7 @@
   lns,
   ppp-options,
   lcpEcho,
+  bandwidth,
   username,
   password,
   debug,
@@ -40,6 +41,7 @@ common {
     username
     password
     lcpEcho
+    bandwidth
     ppp-options
     ;
   command = ''

modules/ppp/pppoe.nix

@@ -13,6 +13,7 @@
   interface,
   ppp-options,
   lcpEcho,
+  bandwidth,
   username,
   password,
   debug,
@@ -31,6 +32,7 @@ common {
     username
     password
     lcpEcho
+    bandwidth
     ppp-options
     ;
   command = ''