hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uqmi: replace logger calls in netifd with echo 

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42720
owl
Felix Fietkau 2014-10-02 12:18:43 +00:00
parent cf595fe834
commit b54144a4c7
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
View File

@ -24,13 +24,13 @@ proto_qmi_setup() {
json_get_vars device apn auth username password pincode delay modes json_get_vars device apn auth username password pincode delay modes
[ -n "$device" ] || { [ -n "$device" ] || {
logger -p daemon.err -t "qmi[$$]" "No control device specified" echo "No control device specified"
proto_notify_error "$interface" NO_DEVICE proto_notify_error "$interface" NO_DEVICE
proto_block_restart "$interface" proto_block_restart "$interface"
return 1 return 1
} }
[ -c "$device" ] || { [ -c "$device" ] || {
logger -p daemon.err -t "qmi[$$]" "The specified control device does not exist" echo "The specified control device does not exist"
proto_notify_error "$interface" NO_DEVICE proto_notify_error "$interface" NO_DEVICE
proto_block_restart "$interface" proto_block_restart "$interface"
return 1 return 1
@ -40,7 +40,7 @@ proto_qmi_setup() {
devpath="$(readlink -f /sys/class/usbmisc/$devname/device/)" devpath="$(readlink -f /sys/class/usbmisc/$devname/device/)"
ifname="$( ls "$devpath"/net )" ifname="$( ls "$devpath"/net )"
[ -n "$ifname" ] || { [ -n "$ifname" ] || {
logger -p daemon.err -t "qmi[$$]" "The interface could not be found." echo "The interface could not be found."
proto_notify_error "$interface" NO_IFACE proto_notify_error "$interface" NO_IFACE
proto_block_restart "$interface" proto_block_restart "$interface"
return 1 return 1
@ -54,7 +54,7 @@ proto_qmi_setup() {
[ -n "$pincode" ] && { [ -n "$pincode" ] && {
uqmi -s -d "$device" --verify-pin1 "$pincode" || { uqmi -s -d "$device" --verify-pin1 "$pincode" || {
logger -p daemon.err -t "qmi[$$]" "Unable to verify PIN" echo "Unable to verify PIN"
proto_notify_error "$interface" PIN_FAILED proto_notify_error "$interface" PIN_FAILED
proto_block_restart "$interface" proto_block_restart "$interface"
return 1 return 1
@ -62,23 +62,23 @@ proto_qmi_setup() {
} }
[ -n "$apn" ] || { [ -n "$apn" ] || {
logger -p daemon.err -t "qmi[$$]" "No APN specified" echo "No APN specified"
proto_notify_error "$interface" NO_APN proto_notify_error "$interface" NO_APN
proto_block_restart "$interface" proto_block_restart "$interface"
return 1 return 1
} }
logger -p daemon.info -t "qmi[$$]" "Waiting for network registration" echo "Waiting for network registration"
while uqmi -s -d "$device" --get-serving-system | grep '"searching"' > /dev/null; do while uqmi -s -d "$device" --get-serving-system | grep '"searching"' > /dev/null; do
sleep 5; sleep 5;
done done
[ -n "$modes" ] && uqmi -s -d "$device" --set-network-modes "$modes" [ -n "$modes" ] && uqmi -s -d "$device" --set-network-modes "$modes"
logger -p daemon.info -t "qmi[$$]" "Starting network $apn" echo "Starting network $apn"
cid=`uqmi -s -d "$device" --get-client-id wds` cid=`uqmi -s -d "$device" --get-client-id wds`
[ $? -ne 0 ] && { [ $? -ne 0 ] && {
logger -p daemon.err -t "qmi[$$]" "Unable to obtain client ID" echo "Unable to obtain client ID"
proto_notify_error "$interface" NO_CID proto_notify_error "$interface" NO_CID
proto_block_restart "$interface" proto_block_restart "$interface"
return 1 return 1
@ -90,7 +90,7 @@ proto_qmi_setup() {
${username:+--username $username} \ ${username:+--username $username} \
${password:+--password $password}` ${password:+--password $password}`
[ $? -ne 0 ] && { [ $? -ne 0 ] && {
logger -p daemon.err -t "qmi[$$]" "Unable to connect, check APN and authentication" echo "Unable to connect, check APN and authentication"
proto_notify_error "$interface" NO_PDH proto_notify_error "$interface" NO_PDH
proto_block_restart "$interface" proto_block_restart "$interface"
return 1 return 1
@ -98,13 +98,13 @@ proto_qmi_setup() {
uci_set_state network $interface pdh "$pdh" uci_set_state network $interface pdh "$pdh"
if ! uqmi -s -d "$device" --get-data-status | grep '"connected"' > /dev/null; then if ! uqmi -s -d "$device" --get-data-status | grep '"connected"' > /dev/null; then
logger -p daemon.err -t "qmi[$$]" "Connection lost" echo "Connection lost"
proto_notify_error "$interface" NOT_CONNECTED proto_notify_error "$interface" NOT_CONNECTED
proto_block_restart "$interface" proto_block_restart "$interface"
return 1 return 1
fi fi
logger -p daemon.info -t "qmi[$$]" "Connected, starting DHCP" echo "Connected, starting DHCP"
proto_init_update "$ifname" 1 proto_init_update "$ifname" 1
proto_send_update "$interface" proto_send_update "$interface"
@ -131,7 +131,7 @@ proto_qmi_teardown() {
local cid=$(uci_get_state network $interface cid) local cid=$(uci_get_state network $interface cid)
local pdh=$(uci_get_state network $interface pdh) local pdh=$(uci_get_state network $interface pdh)
logger -p daemon.info -t "qmi[$$]" "Stopping network" echo "Stopping network"
[ -n "$cid" ] && { [ -n "$cid" ] && {
[ -n "$pdh" ] && { [ -n "$pdh" ] && {
uqmi -s -d "$device" --set-client-id wds,"$cid" --stop-network "$pdh" uqmi -s -d "$device" --set-client-id wds,"$cid" --stop-network "$pdh"