Skip to content
This repository was archived by the owner on Apr 24, 2020. It is now read-only.

Use ip command for VPN segment - fix #1125 #1126

Merged
merged 16 commits into from
Feb 25, 2019
Merged

Use ip command for VPN segment - fix #1125 #1126

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a8fa033
Use ip command for VPN segment - fix #1125
mcinquin Dec 30, 2018
9b73c8b
Add tests
dritter Jan 21, 2019
da50151
Fix regular expression
dritter Jan 21, 2019
32d3216
Fix tests
dritter Jan 22, 2019
480ade1
Improve tests
dritter Jan 23, 2019
54a985c
Simplify code that checks if a VPN is running
dritter Jan 23, 2019
bde4337
Match VPN Interface fuzzy
dritter Jan 23, 2019
747b94b
Match VPN interface fuzzy on Linux
dritter Jan 23, 2019
40e04e0
Parse IPs properly
dritter Feb 3, 2019
06151ee
Merge remote-tracking branch 'ben/master' into HEAD
dritter Feb 3, 2019
a00cb84
Fix regular expression and test
dritter Feb 4, 2019
9f9bc62
Avoid loopback interfaces and parse IPv4 on OSX
dritter Feb 6, 2019
1ab6a32
Interface States can be unsorted
dritter Feb 21, 2019
fef639e
Fix regex
dritter Feb 22, 2019
1049bca
Strip all newlines from ifconfig output
dritter Feb 22, 2019
0dbfa4e
Add small changes suggested by @Syphdias
dritter Feb 25, 2019
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
Prev Previous commit
Next Next commit
Fix tests
  • Loading branch information
@dritter
dritter committed Jan 22, 2019
commit 32d3216bde4c22721ba7e4cb7ff39f12b5f3b2a4
2 changes: 1 addition & 1 deletion test/segments/public_ip.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ function testPublicIpSegmentWithVPNTurnedOnOsx() {

# Fake ifconfig
cat > $FOLDER/sbin/ifconfig <<EOF
#!/bin/sh
#!/usr/bin/env zsh
cat <<INNER
docker0: flags=4099<UP,BROADCAST,MULTICAST> mtu 1500
inet 172.17.0.1 netmask 255.255.0.0 broadcast 172.17.255.255
Expand Down
4 changes: 2 additions & 2 deletions test/segments/vpn_ip.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function tearDown() {
function fakeIfconfig() {
# Fake ifconfig
cat > $FOLDER/sbin/ifconfig <<EOF
#!/bin/sh
#!/usr/bin/env zsh

if [[ "\$#" -gt 0 ]]; then
cat <<INNER
Expand Down Expand Up @@ -80,7 +80,7 @@ function fakeIp() {
local INTERFACE2="${2}"
[[ -z "${INTERFACE2}" ]] && INTERFACE2="disabled-if2"
cat > $FOLDER/sbin/ip <<EOF
#!/bin/sh
#!/usr/bin/env zsh

if [[ "\$*" == 'link ls up' ]]; then
cat <<INNER
Expand Down