summaryrefslogtreecommitdiff
path: root/package/netifd/files/lib
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-10 12:32:29 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-10 12:32:29 +0000
commit9c8997d54dc9df184bfcedeabf0b3c85cf5e6753 (patch)
tree46b83031a0da1b4458317413c00d13c252c72afa /package/netifd/files/lib
parenteecf5b17520f6b3b6ffb45ac7dca298d93b27501 (diff)
packages: sort network related packages into package/network/
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33688 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/netifd/files/lib')
-rwxr-xr-xpackage/netifd/files/lib/netifd/dhcp.script59
-rwxr-xr-xpackage/netifd/files/lib/netifd/proto/dhcp.sh49
-rwxr-xr-xpackage/netifd/files/lib/network/config.sh79
3 files changed, 0 insertions, 187 deletions
diff --git a/package/netifd/files/lib/netifd/dhcp.script b/package/netifd/files/lib/netifd/dhcp.script
deleted file mode 100755
index 0097a96f88..0000000000
--- a/package/netifd/files/lib/netifd/dhcp.script
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
-
-. /lib/functions.sh
-. /lib/netifd/netifd-proto.sh
-
-set_classless_routes() {
- local max=128
- local type
- while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
- proto_add_ipv4_route "${1%%/*}" "${1##*/}" "$2"
- max=$(($max-1))
- shift 2
- done
-}
-
-setup_interface () {
- proto_init_update "*" 1
- proto_add_ipv4_address "$ip" "${subnet:-255.255.255.0}"
- # TODO: apply $broadcast
-
- for i in $router; do
- proto_add_ipv4_route 0.0.0.0 0 "$i"
- done
-
- # CIDR STATIC ROUTES (rfc3442)
- [ -n "$staticroutes" ] && set_classless_routes $staticroutes
- [ -n "$msstaticroutes" ] && set_classless_routes $msstaticroutes
-
- for dns in $dns; do
- proto_add_dns_server "$dns"
- done
- for domain in $domain; do
- proto_add_dns_search "$domain"
- done
- proto_send_update "$INTERFACE"
-
- # TODO
- # [ -n "$ntpsrv" ] && change_state network "$ifc" lease_ntpsrv "$ntpsrv"
- # [ -n "$timesvr" ] && change_state network "$ifc" lease_timesrv "$timesvr"
- # [ -n "$hostname" ] && change_state network "$ifc" lease_hostname "$hostname"
- # [ -n "$timezone" ] && change_state network "$ifc" lease_timezone "$timezone"
-}
-
-deconfig_interface() {
- proto_init_update "*" 0
- proto_send_update "$INTERFACE"
-}
-
-case "$1" in
- deconfig)
- deconfig_interface
- ;;
- renew|bound)
- setup_interface
- ;;
-esac
-
-exit 0
diff --git a/package/netifd/files/lib/netifd/proto/dhcp.sh b/package/netifd/files/lib/netifd/proto/dhcp.sh
deleted file mode 100755
index 9182d58ad8..0000000000
--- a/package/netifd/files/lib/netifd/proto/dhcp.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. ../netifd-proto.sh
-init_proto "$@"
-
-proto_dhcp_init_config() {
- proto_config_add_string "ipaddr"
- proto_config_add_string "netmask"
- proto_config_add_string "hostname"
- proto_config_add_string "clientid"
- proto_config_add_string "vendorid"
- proto_config_add_boolean "broadcast"
- proto_config_add_string "reqopts"
-}
-
-proto_dhcp_setup() {
- local config="$1"
- local iface="$2"
-
- local ipaddr hostname clientid vendorid broadcast reqopts
- json_get_vars ipaddr hostname clientid vendorid broadcast reqopts
-
- local opt dhcpopts
- for opt in $reqopts; do
- append dhcpopts "-O $opt"
- done
-
- [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
-
- proto_export "INTERFACE=$config"
- proto_run_command "$config" udhcpc \
- -p /var/run/udhcpc-$iface.pid \
- -s /lib/netifd/dhcp.script \
- -f -t 0 -i "$iface" \
- ${ipaddr:+-r $ipaddr} \
- ${hostname:+-H $hostname} \
- ${clientid:+-x 0x3d:${clientid//:/}} \
- ${vendorid:+-V $vendorid} \
- $broadcast $dhcpopts
-}
-
-proto_dhcp_teardown() {
- local interface="$1"
- proto_kill_command "$interface"
-}
-
-add_protocol dhcp
-
diff --git a/package/netifd/files/lib/network/config.sh b/package/netifd/files/lib/network/config.sh
deleted file mode 100755
index 9128971dab..0000000000
--- a/package/netifd/files/lib/network/config.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2011 OpenWrt.org
-
-. /usr/share/libubox/jshn.sh
-
-find_config() {
- local device="$1"
- local ifdev ifl3dev ifobj
- for ifobj in `ubus list network.interface.\*`; do
- interface="${ifobj##network.interface.}"
- (
- json_load "$(ifstatus $interface)"
- json_get_var ifdev device
- json_get_var ifl3dev l3_device
- if [[ "$device" = "$ifdev" ]] || [[ "$device" = "$ifl3dev" ]]; then
- echo "$interface"
- exit 0
- else
- exit 1
- fi
- ) && return
- done
-}
-
-unbridge() {
- return
-}
-
-ubus_call() {
- json_init
- local _data="$(ubus -S call "$1" "$2")"
- [ -z "$_data" ] && return 1
- json_load "$_data"
- return 0
-}
-
-
-fixup_interface() {
- local config="$1"
- local ifname type device l3dev
-
- config_get type "$config" type
- config_get ifname "$config" ifname
- config_get device "$config" device "$ifname"
- [ "bridge" = "$type" ] && ifname="br-$config"
- config_set "$config" device "$ifname"
- ubus_call "network.interface.$config" status || return 0
- json_get_var l3dev l3_device
- [ -n "$l3dev" ] && ifname="$l3dev"
- json_init
- config_set "$config" ifname "$ifname"
- config_set "$config" device "$device"
-}
-
-scan_interfaces() {
- config_load network
- config_foreach fixup_interface interface
-}
-
-prepare_interface_bridge() {
- local config="$1"
-
- [ -n "$config" ] || return 0
- ubus call network.interface."$config" prepare
-}
-
-setup_interface() {
- local iface="$1"
- local config="$2"
-
- [ -n "$config" ] || return 0
- ubus call network.interface."$config" add_device "{ \"name\": \"$iface\" }"
-}
-
-do_sysctl() {
- [ -n "$2" ] && \
- sysctl -n -e -w "$1=$2" >/dev/null || \
- sysctl -n -e "$1"
-}