#!/bin/sh
-. /lib/functions.sh
-. ../netifd-proto.sh
-init_proto "$@"
+[ -n "$INCLUDE_ONLY" ] || {
+ . /lib/functions.sh
+ . ../netifd-proto.sh
+ init_proto "$@"
+}
proto_ncm_init_config() {
no_device=1
proto_config_add_string pincode
proto_config_add_string delay
proto_config_add_string mode
+ proto_config_add_string pdptype
+ proto_config_add_int profile
+ proto_config_add_defaults
}
proto_ncm_setup() {
local interface="$1"
- local manufacturer initialize setmode connect
+ local manufacturer initialize setmode connect finalize ifname devname devpath
+
+ local device apn auth username password pincode delay mode pdptype profile $PROTO_DEFAULT_OPTIONS
+ json_get_vars device apn auth username password pincode delay mode pdptype profile $PROTO_DEFAULT_OPTIONS
+
+ [ "$metric" = "" ] && metric="0"
- local device apn auth username password pincode delay mode
- json_get_vars device apn auth username password pincode delay mode
+ [ -n "$profile" ] || profile=1
+
+ pdptype=`echo "$pdptype" | awk '{print toupper($0)}'`
+ [ "$pdptype" = "IP" -o "$pdptype" = "IPV6" -o "$pdptype" = "IPV4V6" ] || pdptype="IP"
+
+ [ -n "$ctl_device" ] && device=$ctl_device
[ -n "$device" ] || {
- echo "ncm[$$]" "No control device specified"
+ echo "No control device specified"
proto_notify_error "$interface" NO_DEVICE
proto_set_available "$interface" 0
return 1
}
+
+ device="$(readlink -f $device)"
[ -e "$device" ] || {
- echo "ncm[$$]" "Control device not valid"
+ echo "Control device not valid"
proto_set_available "$interface" 0
return 1
}
- [ -n "$apn" ] || {
- echo "ncm[$$]" "No APN specified"
- proto_notify_error "$interface" NO_APN
+
+ devname="$(basename "$device")"
+ case "$devname" in
+ 'tty'*)
+ devpath="$(readlink -f /sys/class/tty/$devname/device)"
+ ifname="$( ls "$devpath"/../../*/net )"
+ ;;
+ *)
+ devpath="$(readlink -f /sys/class/usbmisc/$devname/device/)"
+ ifname="$( ls "$devpath"/net )"
+ ;;
+ esac
+ [ -n "$ifname" ] || {
+ echo "The interface could not be found."
+ proto_notify_error "$interface" NO_IFACE
proto_set_available "$interface" 0
return 1
}
[ -n "$delay" ] && sleep "$delay"
- manufacturer=`gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | awk '/Manufacturer/ { print $2 }'`
+ manufacturer=`gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | awk 'NF && $0 !~ /AT\+CGMI/ { sub(/\+CGMI: /,""); print tolower($1); exit; }'`
[ $? -ne 0 ] && {
- echo "ncm[$$]" "Failed to get modem information"
+ echo "Failed to get modem information"
proto_notify_error "$interface" GETINFO_FAILED
- proto_set_available "$interface" 0
return 1
}
json_load "$(cat /etc/gcom/ncm.json)"
json_select "$manufacturer"
[ $? -ne 0 ] && {
- echo "ncm[$$]" "Unsupported modem"
+ echo "Unsupported modem"
proto_notify_error "$interface" UNSUPPORTED_MODEM
proto_set_available "$interface" 0
return 1
json_get_values initialize initialize
for i in $initialize; do
eval COMMAND="$i" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
- echo "ncm[$$]" "Failed to initialize modem"
+ echo "Failed to initialize modem"
proto_notify_error "$interface" INITIALIZE_FAILED
- proto_set_available "$interface" 0
return 1
}
done
[ -n "$pincode" ] && {
PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || {
- echo "ncm[$$]" "Unable to verify PIN"
+ echo "Unable to verify PIN"
proto_notify_error "$interface" PIN_FAILED
proto_block_restart "$interface"
return 1
}
}
+
+ json_get_values configure configure
+ echo "Configuring modem"
+ for i in $configure; do
+ eval COMMAND="$i" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
+ echo "Failed to configure modem"
+ proto_notify_error "$interface" CONFIGURE_FAILED
+ return 1
+ }
+ done
+
[ -n "$mode" ] && {
json_select modes
json_get_var setmode "$mode"
- COMMAND="$setmode" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
- echo "ncm[$$]" "Failed to set operating mode"
+ echo "Setting mode"
+ eval COMMAND="$setmode" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
+ echo "Failed to set operating mode"
proto_notify_error "$interface" SETMODE_FAILED
- proto_set_available "$interface" 0
return 1
}
json_select ..
}
- json_get_var connect connect
+ echo "Starting network $interface"
+ json_get_vars connect
+ echo "Connecting modem"
eval COMMAND="$connect" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
- echo "ncm[$$]" "Failed to connect"
+ echo "Failed to connect"
proto_notify_error "$interface" CONNECT_FAILED
- proto_set_available "$interface" 0
return 1
}
- echo "ncm[$$]" "Connected, starting DHCP"
- proto_init_update "*" 1
+ json_get_vars finalize
+
+ echo "Setting up $ifname"
+ proto_init_update "$ifname" 1
+ proto_add_data
+ json_add_string "manufacturer" "$manufacturer"
+ proto_close_data
proto_send_update "$interface"
- json_init
- json_add_string name "${interface}_dhcp"
- json_add_string ifname "@$interface"
- json_add_string proto "dhcp"
- json_close_object
- ubus call network add_dynamic "$(json_dump)"
-
- json_init
- json_add_string name "${interface}_dhcpv6"
- json_add_string ifname "@$interface"
- json_add_string proto "dhcpv6"
- json_close_object
- ubus call network add_dynamic "$(json_dump)"
+ local zone="$(fw3 -q network "$interface" 2>/dev/null)"
+
+ [ "$pdptype" = "IP" -o "$pdptype" = "IPV4V6" ] && {
+ json_init
+ json_add_string name "${interface}_4"
+ json_add_string ifname "@$interface"
+ json_add_string proto "dhcp"
+ proto_add_dynamic_defaults
+ [ -n "$zone" ] && {
+ json_add_string zone "$zone"
+ }
+ json_close_object
+ ubus call network add_dynamic "$(json_dump)"
+ }
+
+ [ "$pdptype" = "IPV6" -o "$pdptype" = "IPV4V6" ] && {
+ json_init
+ json_add_string name "${interface}_6"
+ json_add_string ifname "@$interface"
+ json_add_string proto "dhcpv6"
+ json_add_string extendprefix 1
+ proto_add_dynamic_defaults
+ [ -n "$zone" ] && {
+ json_add_string zone "$zone"
+ }
+ json_close_object
+ ubus call network add_dynamic "$(json_dump)"
+ }
+
+ [ -n "$finalize" ] && {
+ eval COMMAND="$finalize" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
+ echo "Failed to configure modem"
+ proto_notify_error "$interface" FINALIZE_FAILED
+ return 1
+ }
+ }
+
}
proto_ncm_teardown() {
local interface="$1"
- proto_init_update "*" 0
- proto_send_update "$interface"
-
local manufacturer disconnect
- local device
- json_get_vars device
+ local device profile
+ json_get_vars device profile
- echo "ncm[$$]" "Stopping network"
+ [ -n "$ctl_device" ] && device=$ctl_device
- manufacturer=`gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | awk '/Manufacturer/ { print $2 }'`
- [ $? -ne 0 ] && {
- echo "ncm[$$]" "Failed to get modem information"
- proto_notify_error "$interface" GETINFO_FAILED
- return 1
- }
+ [ -n "$profile" ] || profile=1
+
+ echo "Stopping network $interface"
+
+ json_load "$(ubus call network.interface.$interface status)"
+ json_select data
+ json_get_vars manufacturer
json_load "$(cat /etc/gcom/ncm.json)"
json_select "$manufacturer" || {
- echo "ncm[$$]" "Unsupported modem"
+ echo "Unsupported modem"
proto_notify_error "$interface" UNSUPPORTED_MODEM
return 1
}
- json_get_var disconnect disconnect
- COMMAND="$disconnect" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
- echo "ncm[$$]" "Failed to disconnect"
+ json_get_vars disconnect
+ eval COMMAND="$disconnect" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
+ echo "Failed to disconnect"
proto_notify_error "$interface" DISCONNECT_FAILED
return 1
}
-}
-add_protocol ncm
+ proto_init_update "*" 0
+ proto_send_update "$interface"
+}
+[ -n "$INCLUDE_ONLY" ] || {
+ add_protocol ncm
+}
projects / openwrt / openwrt.git / blobdiff