diff options
| author | Kody A Kantor <kody@kkantor.com> | 2018-06-05 14:55:12 +0000 |
|---|---|---|
| committer | Kody A Kantor <kody@kkantor.com> | 2018-06-05 20:50:34 +0000 |
| commit | c4c6537e10afdbfcc5221e2f9c3d5d80780235fa (patch) | |
| tree | 5cfd302715fd70cf137c581b135284e2d342dd28 | |
| parent | 65e782538ba0e28b5bae27b0357c8afba9e788a6 (diff) | |
| download | illumos-joyent-c4c6537e10afdbfcc5221e2f9c3d5d80780235fa.tar.gz | |
OS-1666 Increase ipdadm packet delay limit to 1s
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
| -rw-r--r-- | usr/src/uts/common/inet/ipd/ipd.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/ipd.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/uts/common/inet/ipd/ipd.c b/usr/src/uts/common/inet/ipd/ipd.c index 553c215984..747a7a814f 100644 --- a/usr/src/uts/common/inet/ipd/ipd.c +++ b/usr/src/uts/common/inet/ipd/ipd.c @@ -9,7 +9,7 @@ * http://www.illumos.org/license/CDDL. */ /* - * Copyright (c) 2012, Joyent, Inc. All rights reserved. + * Copyright (c) 2018, Joyent, Inc. All rights reserved. */ /* @@ -222,7 +222,7 @@ typedef struct ipd_netstack { net_handle_t ipdn_v6hdl; /* IPv4 net handle */ int ipdn_hooked; /* are hooks registered */ hook_t *ipdn_v4in; /* IPv4 traffic in hook */ - hook_t *ipdn_v4out; /* IPv4 traffice out hook */ + hook_t *ipdn_v4out; /* IPv4 traffic out hook */ hook_t *ipdn_v6in; /* IPv6 traffic in hook */ hook_t *ipdn_v6out; /* IPv6 traffic out hook */ int ipdn_enabled; /* which perturbs are on */ @@ -613,7 +613,7 @@ ipd_toggle_delay(ipd_netstack_t *ins, uint32_t delay) /* * If ipd_check_hooks_failed, that must mean that we failed to set up * the hooks, so we are going to effectively zero out and fail the - * request to enable corruption. + * request to enable packet delays. */ if (rval != 0) ins->ipdn_delay = 0; diff --git a/usr/src/uts/common/sys/ipd.h b/usr/src/uts/common/sys/ipd.h index bad74f8b81..f21c3fb5af 100644 --- a/usr/src/uts/common/sys/ipd.h +++ b/usr/src/uts/common/sys/ipd.h @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2012, Joyent, Inc. All rights reserved. + * Copyright (c) 2018, Joyent, Inc. All rights reserved. */ /* @@ -35,7 +35,7 @@ extern "C" { #endif #define IPD_DEV_PATH "/dev/ipd" -#define IPD_MAX_DELAY 10000 /* 10 ms in us */ +#define IPD_MAX_DELAY 1000000 /* 1 second in microseconds */ typedef struct ipd_ioc_perturb { zoneid_t ipip_zoneid; |