ffhb/freifunkmanager
ffhb
/
freifunkmanager
mirror of https://github.com/FreifunkBremen/freifunkmanager.git
1
0
Fork 0
Code Issues Releases Wiki Activity

node_ssh.go: add node hostname to offline-SSID

This commit is contained in:
Oliver Gerlich 2019-07-01 15:23:47 +02:00
parent 8751d401d3
commit 4d030892b5
1 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
runtime/node_ssh.go
View File

@ -45,6 +45,7 @@ func (n *Node) SSHUpdate(sshmgmt *ssh.Manager) bool {
} }
}() }()
// update settings for 2.4GHz (802.11g) radio
result, err := ssh.Run(n.Address, client, ` result, err := ssh.Run(n.Address, client, `
if [ "$(uci get wireless.radio0.hwmode | grep -c g)" -ne 0 ]; then if [ "$(uci get wireless.radio0.hwmode | grep -c g)" -ne 0 ]; then
echo "radio0"; echo "radio0";
@ -56,25 +57,37 @@ func (n *Node) SSHUpdate(sshmgmt *ssh.Manager) bool {
} }
radio := ssh.SSHResultToString(result) radio := ssh.SSHResultToString(result)
ch := GetChannel(n.Wireless.Channel24) ch := GetChannel(n.Wireless.Channel24)
if radio != "" && ch != nil { if radio != "" {
if n.Wireless.TxPower24 != n.WirelessRespondd.TxPower24 { if ch != nil {
ssh.Execute(n.Address, client, fmt.Sprintf(` if n.Wireless.TxPower24 != n.WirelessRespondd.TxPower24 {
uci set wireless.%s.txpower='%d'; ssh.Execute(n.Address, client, fmt.Sprintf(`
uci commit wireless;`, uci set wireless.%s.txpower='%d';
radio, n.Wireless.TxPower24)) uci commit wireless;`,
//runWifi = true radio, n.Wireless.TxPower24))
} //runWifi = true
if n.Wireless.Channel24 != n.WirelessRespondd.Channel24 { }
//ubus call hostapd.%s switch_chan '{"freq":%d}' if n.Wireless.Channel24 != n.WirelessRespondd.Channel24 {
ssh.Execute(n.Address, client, fmt.Sprintf(` //ubus call hostapd.%s switch_chan '{"freq":%d}'
uci set wireless.%s.channel='%d'; ssh.Execute(n.Address, client, fmt.Sprintf(`
uci commit wireless;`, uci set wireless.%s.channel='%d';
//strings.Replace(radio, "radio", "client", 1), ch.Frequency, uci commit wireless;`,
radio, n.Wireless.Channel24)) //strings.Replace(radio, "radio", "client", 1), ch.Frequency,
runWifi = true radio, n.Wireless.Channel24))
runWifi = true
}
} }
if n.Hostname != n.HostnameRespondd {
ssh.Execute(n.Address, client, fmt.Sprintf(`
uci set wireless.priv_%s.ssid='offline-%s';
uci commit wireless;`,
n.Hostname))
runWifi = true
}
} }
// update settings for 5GHz (802.11a) radio
result, err = ssh.Run(n.Address, client, ` result, err = ssh.Run(n.Address, client, `
if [ "$(uci get wireless.radio0.hwmode | grep -c a)" -ne 0 ]; then if [ "$(uci get wireless.radio0.hwmode | grep -c a)" -ne 0 ]; then
echo "radio0"; echo "radio0";
@ -86,23 +99,33 @@ func (n *Node) SSHUpdate(sshmgmt *ssh.Manager) bool {
} }
radio = ssh.SSHResultToString(result) radio = ssh.SSHResultToString(result)
ch = GetChannel(n.Wireless.Channel5) ch = GetChannel(n.Wireless.Channel5)
if radio != "" && ch != nil { if radio != "" {
if n.Wireless.TxPower5 != n.WirelessRespondd.TxPower5 { if ch != nil {
ssh.Execute(n.Address, client, fmt.Sprintf(` if n.Wireless.TxPower5 != n.WirelessRespondd.TxPower5 {
uci set wireless.%s.txpower='%d'; ssh.Execute(n.Address, client, fmt.Sprintf(`
uci commit wireless;`, uci set wireless.%s.txpower='%d';
radio, n.Wireless.TxPower5)) uci commit wireless;`,
//runWifi = true radio, n.Wireless.TxPower5))
//runWifi = true
}
if n.Wireless.Channel5 != n.WirelessRespondd.Channel5 {
//ubus call hostapd.%s switch_chan '{"freq":%d}'
ssh.Execute(n.Address, client, fmt.Sprintf(`
uci set wireless.%s.channel='%d';
uci commit wireless;`,
//strings.Replace(radio, "radio", "client", 1), ch.Frequency,
radio, n.Wireless.Channel5))
runWifi = true
}
} }
if n.Wireless.Channel5 != n.WirelessRespondd.Channel5 { if n.Hostname != n.HostnameRespondd {
//ubus call hostapd.%s switch_chan '{"freq":%d}'
ssh.Execute(n.Address, client, fmt.Sprintf(` ssh.Execute(n.Address, client, fmt.Sprintf(`
uci set wireless.%s.channel='%d'; uci set wireless.priv_%s.ssid='offline-%s';
uci commit wireless;`, uci commit wireless;`,
//strings.Replace(radio, "radio", "client", 1), ch.Frequency, n.Hostname))
radio, n.Wireless.Channel5))
runWifi = true runWifi = true
} }
} }
return true return true
} }