Convert HOOK_SETTINGS into an array

[people/stevee/network.git] / src / hooks / ports / bonding

diff --git a/src/hooks/ports/bonding b/src/hooks/ports/bonding
index 6e3f62eeb606dbddb4213eb1a04656c0cd90c8d1..09fb74f0ad541c072ddbd5afb6e1e766a5acfe37 100644 (file)
--- a/src/hooks/ports/bonding
+++ b/src/hooks/ports/bonding
@@ -21,12 +21,16 @@
 
 . /usr/lib/network/header-port
 
-HOOK_SETTINGS="HOOK ADDRESS MIIMON MODE SLAVES"
+HOOK_SETTINGS=(
+       "ADDRESS"
+       "MIIMON"
+       "MODE"
+       "OFFLOADING"
+       "SLAVES"
+)
 
-ADDRESS=$(mac_generate)
-SLAVES=""
-MIIMON=100
-MODE="balance-rr"
+DEFAULT_MIIMON=100
+DEFAULT_MODE="balance-rr"
 
 hook_check_settings() {
        assert isset ADDRESS
@@ -36,29 +40,54 @@ hook_check_settings() {
        assert isinteger MIIMON
 }
 
-hook_new() {
-       hook_edit $@
-}
-
-hook_edit() {
-       local port=${1}
-       assert isset port
-       shift
-
+hook_parse_cmdline() {
        while [ $# -gt 0 ]; do
                case "${1}" in
                        --address=*)
-                               ADDRESS=$(cli_get_val ${1})
+                               ADDRESS="$(cli_get_val "${1}")"
+
+                               if ! mac_is_valid "${ADDRESS}"; then
+                                       error "Invalid MAC address: ${ADDRESS}"
+                                       return ${EXIT_ERROR}
+                               fi
                                ;;
+
                        --miimon=*)
-                               MIIMON=$(cli_get_val ${1})
+                               MIIMON=$(cli_get_val "${1}")
                                ;;
                        --mode=*)
-                               MODE=$(cli_get_val ${1})
+                               MODE=$(cli_get_val "${1}")
                                ;;
-                       --slave=*)
-                               slave=$(cli_get_val ${1})
-                               SLAVES="${SLAVES} ${slave}"
+                       --offloading=*)
+                               OFFLOADING="$(cli_get_val "${1}")"
+
+                               if enabled OFFLOADING; then
+                                       OFFLOADING="on"
+                               elif disabled OFFLOADING; then
+                                       OFFLOADING="off"
+                               else
+                                       error "Invalid value for offloading: ${OFFLOADING}"
+                                       return ${EXIT_ERROR}
+                               fi
+                               ;;
+                       +*)
+                               local slave=$(cli_get_val "${1:1}")
+
+                               if port_exists "${slave}"; then
+                                       if list_match "${slave}" ${SLAVES}; then
+                                               warning "Port ${slave} is already enslaved"
+                                       else
+                                               list_append SLAVES "${slave}"
+                                       fi
+                               else
+                                       warning "Port ${slave} does not exist"
+                               fi
+                               ;;
+                       -*)
+                               local slave=$(cli_get_val "${1:1}")
+                               if ! list_remove SLAVES "${slave}"; then
+                                       warning "Port ${slave} is not a slave of this bonding device"
+                               fi
                                ;;
                        *)
                                warning "Unknown argument '${1}'"
@@ -67,33 +96,69 @@ hook_edit() {
                shift
        done
 
-       DEVICE=${port}
+       if isset ADDRESS; then
+               if ! ismac ADDRESS; then
+                       error "The given MAC address is invalid: ${ADDRESS}"
+                       return ${EXIT_ERROR}
+               fi
+       else
+               ADDRESS=$(mac_generate)
+       fi
+}
+
+hook_new() {
+       if ! hook_parse_cmdline "$@"; then
+               return ${EXIT_ERROR}
+       fi
+
+       # Find a new name
+       local port=$(port_find_free ${BONDING_PORT_PATTERN})
+       assert isset port
 
-       # XXX think this must move to _check()
-       if ! isset DEVICE; then
-               error "You must set a device name."
-               exit ${EXIT_ERROR}
+       # Save configuration
+       if port_settings_write "${port}" ${HOOK_SETTINGS[*]}; then
+               log INFO "New port ${port} has been created"
+       else
+               error "Could not save configuration for ${port}"
+               return ${EXIT_ERROR}
        fi
 
-       if ! isset SLAVES; then
-               error "You need to specify at least one slave port (e.g. --slave=port0)."
-               exit ${EXIT_ERROR}
+       return ${EXIT_OK}
+}
+
+hook_edit() {
+       local port=${1}
+
+       if ! hook_default_edit "$@"; then
+               return ${EXIT_ERROR}
        fi
 
-       local slave
-       for slave in $(unquote ${SLAVES}); do
-               if ! device_is_ethernet_compatible ${slave}; then
-                       error "The slave device '${slave}' is not able to transport ethernet frames"
-                       exit ${EXIT_ERROR}
+       # If the master device is up, make sure that all
+       # slaves are up, too
+       if device_exists "${port}"; then
+               # Setting the mode requires us to destroy the device
+               # and to recreate it again.
+               local mode=$(bonding_get_mode "${port}")
+               if [ "${mode}" != "${MODE}" ]; then
+                       port_restart "${port}"
+                       return ${EXIT_OK}
                fi
-       done
 
-       # Remove any whitespace
-       SLAVES=$(echo ${SLAVES})
+               # Set address
+               device_set_address "${port}" "${ADDRESS}"
 
-       port_settings_write "${port}" ${HOOK_SETTINGS}
+               # Set miimon
+               bonding_set_miimon "${port}" "${MIIMON}"
 
-       exit ${EXIT_OK}
+               local slave
+               for slave in ${SLAVES}; do
+                       if device_exists "${slave}"; then
+                               bonding_enslave_device "${port}" "${slave}"
+                       else
+                               port_create "${slave}"
+                       fi
+               done
+       fi
 }
 
 hook_create() {
@@ -103,7 +168,7 @@ hook_create() {
        # Exit silently if the device already exists
        device_exists "${port}" && exit ${EXIT_OK}
 
-       port_settings_read "${port}" ${HOOK_SETTINGS}
+       port_settings_read "${port}" ${HOOK_SETTINGS[*]}
 
        # Create the bonding devices
        bonding_create "${port}" \
@@ -119,7 +184,7 @@ hook_remove() {
        local port="${1}"
        assert isset port
 
-       port_settings_read "${port}" ${HOOK_SETTINGS}
+       port_settings_read "${port}" ${HOOK_SETTINGS[*]}
 
        # Remove the bonding device
        if device_exists "${port}"; then
@@ -131,7 +196,14 @@ hook_up() {
        local port="${1}"
        assert isset port
 
-       port_settings_read "${port}" ${HOOK_SETTINGS}
+       port_settings_read "${port}" ${HOOK_SETTINGS[*]}
+
+       # Auto-enable or disable hardware offloading
+       if ! isset OFFLOADING || enabled OFFLOADING; then
+               offloading_auto "${port}"
+       else
+               offloading_disable_all "${port}"
+       fi
 
        # Execute the default action
        hook_default_up "${port}"
@@ -147,7 +219,7 @@ hook_down() {
        local port="${1}"
        assert isset port
 
-       port_settings_read "${port}" ${HOOK_SETTINGS}
+       port_settings_read "${port}" ${HOOK_SETTINGS[*]}
 
        # Bring down all slaves
        local slave
@@ -168,7 +240,7 @@ hook_hotplug() {
                        # Handle events of the same interface
                        if hotplug_event_port_is_interface "${port}"; then
                                # Read configuration
-                               port_settings_read "${port}" ${HOOK_SETTINGS}
+                               port_settings_read "${port}" ${HOOK_SETTINGS[*]}
 
                                # Bring up all slaves
                                # Attach those which already exist and try to create