applications/create_ap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use ip' instead of brctl'

Browse Source 
This removes bridge-utils from dependencies.
This commit is contained in:
oblique 2015-02-22 21:58:35 +02:00
parent 796c420589
commit f06e24721a
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -23,9 +23,6 @@
* dnsmasq * dnsmasq
* iptables * iptables
### For 'Bridged' Internet sharing method
* bridge-utils
## Installation ## Installation
### Generic ### Generic

28
create_ap
View File

@ -13,9 +13,6 @@
# dnsmasq # dnsmasq
# iptables # iptables
# dependencies for 'bridge' Internet sharing method
# bridge-utils
# make sure that all command outputs are in english # make sure that all command outputs are in english
# so we can parse them correctly # so we can parse them correctly
@ -115,7 +112,8 @@ is_wifi_interface() {
} }
is_bridge_interface() { is_bridge_interface() {
brctl show | cut -f1 | grep -E "^$1\$" > /dev/null 2>&1 [[ -z "$1" ]] && return 1
[[ -d "/sys/class/net/${1}/bridge" ]]
} }
get_phy_device() { get_phy_device() {
@ -462,8 +460,11 @@ _cleanup() {
fi fi
if ! is_bridge_interface $INTERNET_IFACE; then if ! is_bridge_interface $INTERNET_IFACE; then
ip link set down $BRIDGE_IFACE ip link set dev $BRIDGE_IFACE down
brctl delbr $BRIDGE_IFACE ip link set dev $INTERNET_IFACE down
ip link set dev $INTERNET_IFACE promisc off
ip link set dev $INTERNET_IFACE nomaster
ip link delete $BRIDGE_IFACE type bridge
ip addr flush $INTERNET_IFACE ip addr flush $INTERNET_IFACE
ip link set dev $INTERNET_IFACE up ip link set dev $INTERNET_IFACE up
@ -479,11 +480,13 @@ _cleanup() {
ip route flush dev $INTERNET_IFACE ip route flush dev $INTERNET_IFACE
for x in "${ROUTE_ADDRS[@]}"; do for x in "${ROUTE_ADDRS[@]}"; do
[[ -z "$x" ]] && continue
[[ "$x" == default* ]] && continue [[ "$x" == default* ]] && continue
ip route add $x dev $INTERNET_IFACE ip route add $x dev $INTERNET_IFACE
done done
for x in "${ROUTE_ADDRS[@]}"; do for x in "${ROUTE_ADDRS[@]}"; do
[[ -z "$x" ]] && continue
[[ "$x" != default* ]] && continue [[ "$x" != default* ]] && continue
ip route add $x dev $INTERNET_IFACE ip route add $x dev $INTERNET_IFACE
done done
@ -1040,7 +1043,7 @@ if [[ "$SHARE_METHOD" != "none" ]]; then
# #
# 1) save the IPs and route table of INTERNET_IFACE # 1) save the IPs and route table of INTERNET_IFACE
# 2) if NetworkManager is running set INTERNET_IFACE as unmanaged # 2) if NetworkManager is running set INTERNET_IFACE as unmanaged
# 3) create BRIDGE_IFACE and add INTERNET_IFACE to it # 3) create BRIDGE_IFACE and attach INTERNET_IFACE to it
# 4) set the previously saved IPs and route table to BRIDGE_IFACE # 4) set the previously saved IPs and route table to BRIDGE_IFACE
# #
# we need the above because BRIDGE_IFACE is the master interface from now on # we need the above because BRIDGE_IFACE is the master interface from now on
@ -1060,11 +1063,16 @@ if [[ "$SHARE_METHOD" != "none" ]]; then
networkmanager_wait_until_unmanaged $INTERNET_IFACE networkmanager_wait_until_unmanaged $INTERNET_IFACE
fi fi
brctl addbr $BRIDGE_IFACE || die # create bridge interface
brctl setfd $BRIDGE_IFACE 0 ip link add name $BRIDGE_IFACE type bridge || die
brctl addif $BRIDGE_IFACE $INTERNET_IFACE || die
ip link set dev $BRIDGE_IFACE up || die ip link set dev $BRIDGE_IFACE up || die
# set 0ms forward delay
echo 0 > /sys/class/net/$BRIDGE_IFACE/bridge/forward_delay
# attach internet interface to bridge interface
ip link set dev $INTERNET_IFACE promisc on || die
ip link set dev $INTERNET_IFACE up || die ip link set dev $INTERNET_IFACE up || die
ip link set dev $INTERNET_IFACE master $BRIDGE_IFACE || die
ip addr flush $INTERNET_IFACE ip addr flush $INTERNET_IFACE
for x in "${IP_ADDRS[@]}"; do for x in "${IP_ADDRS[@]}"; do