Skip to content

[pull] master from tylertreat:master #1

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.

Sign up for GitHub

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

Merged
merged 18 commits into from
Apr 14, 2023
Merged

[pull] master from tylertreat:master #1

Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3bd5291
Bump Travis versions
HaraldNordgren Oct 20, 2018
e02a304
Merge pull request #62 from HaraldNordgren/go_versions
tylertreat Oct 20, 2018
ea01fc0
Update .travis.yml
jievince Jun 30, 2019
3f41d67
Update .travis.yml
jievince Jun 30, 2019
515e047
Update .travis.yml
jievince Jun 30, 2019
4655fd6
Update .travis.yml
jievince Jun 30, 2019
2e65f8c
Merge pull request #64 from jievince/master
tylertreat Jul 2, 2019
e9c8bbe
fixed README statement and removed dead code
haseth Mar 23, 2020
36c754a
Merge pull request #70 from haseth/patch-1
tylertreat Mar 23, 2020
8847be5
Update README.md
chadbrewbaker Jun 1, 2021
369bbed
Merge pull request #75 from chadbrewbaker/master
tylertreat Jun 2, 2021
0fb9185
pfctl supports `--device` option
castaneai Dec 27, 2021
e400a3c
Merge pull request #76 from castaneai/pfctl-device
tylertreat Dec 27, 2021
d799153
add Makefile and module support
milzero Mar 13, 2022
af46637
Update go.mod
milzero Mar 13, 2022
0465cfc
Merge pull request #77 from milzero/master
tylertreat Mar 14, 2022
550fbf8
update readme to use go install instead of deprecated go get
Apr 22, 2022
461b29c
Merge pull request #78 from dgretton/newinstall
tylertreat Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions throttler/pfctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const (
pfctlCreateAnchor = `(cat /etc/pf.conf && echo "dummynet-anchor \"mop\"" && echo "anchor \"mop\"") | sudo pfctl -f -`
pfctlTeardown = `sudo pfctl -f /etc/pf.conf`
dnctl = `sudo dnctl pipe 1 config`
pfctlCreateDummynet = `echo $'dummynet in all pipe 1'`
pfctlCreateDummynet = `echo $'dummynet in on %s all pipe 1'`
pfctlExecuteInline = `%s | sudo pfctl -a mop -f - `
pfctlEnableFirewall = `sudo pfctl -E`
pfctlEnableFwRegex = `pf enabled`
Expand Down Expand Up @@ -58,11 +58,12 @@ func (i *pfctlThrottler) setup(c *Config) error {
}

// Add 'execute' portion of the command
cmd := fmt.Sprintf(pfctlExecuteInline, pfctlCreateDummynet)
input := fmt.Sprintf(pfctlCreateDummynet, c.Device)
cmd := fmt.Sprintf(pfctlExecuteInline, input)

err = i.c.execute(cmd)
if err != nil {
return errors.New(fmt.Sprintf("Could not create dummynet using: `%s`. Error: %s", pfctlCreateDummynet, err.Error()))
return errors.New(fmt.Sprintf("Could not create dummynet using: `%s`. Error: %s", input, err.Error()))
}

// Apply the shaping etc.
Expand Down