hotplug: Remove multiple copies of the same function

[people/ms/network.git] / src / header-port

diff --git a/src/header-port b/src/header-port
index 489958fa276745e23fcc910a8e8ef22a75303fc2..d75fdd86240b7bc344202c1ab794288951c56cf9 100644 (file)
--- a/src/header-port
+++ b/src/header-port
@@ -21,6 +21,8 @@
 
 INFO_SETTINGS="HOOK PORT_PARENTS PORT_CHILDREN"
 
+HOOK_PORT_PATTERN="${PORT_PATTERN}"
+
 # This function is called after a device has been plugged
 # into the system and got its correct name.
 # The function is intended to create child ports and things
@@ -40,7 +42,38 @@ hook_hotplug_rename() {
        exit ${EXIT_FALSE}
 }
 
+hook_hotplug_rename_by_address() {
+       local port="${1}"
+       assert isset port
+
+       local device="${2}"
+       assert isset device
+
+       # Read in the conifguration file.
+       if ! port_settings_read "${port}"; then
+               return ${EXIT_ERROR}
+       fi
+
+       # Get the current MAC address of the device.
+       local address="$(device_get_address "${device}")"
+       assert isset address
+
+       # Check if the address matches with the configuration.
+       if list_match "${address}" "${ADDRESS}" "${DEVICE}"; then
+               log DEBUG "Device '${device}' is port '${port}'"
+               return ${EXIT_OK}
+       fi
+
+       log DEBUG "Device '${device}' is not port '${port}'"
+       return ${EXIT_ERROR}
+}
+
 hook_default_new() {
+       local ${HOOK_SETTINGS[*]}
+
+       # Import all default variables
+       hook_set_defaults
+
        if ! hook_parse_cmdline "$@"; then
                return ${EXIT_ERROR}
        fi
@@ -50,7 +83,7 @@ hook_default_new() {
        local port=$(port_find_free ${HOOK_PORT_PATTERN})
        assert isset port
 
-       port_settings_write "${port}" ${HOOK_SETTINGS}
+       port_settings_write "${port}" ${HOOK_SETTINGS[*]}
 
        exit ${EXIT_OK}
 }
@@ -65,7 +98,7 @@ hook_default_edit() {
        shift
 
        # Read settings
-       if ! port_settings_read "${port}" ${HOOK_SETTINGS}; then
+       if ! port_settings_read "${port}" ${HOOK_SETTINGS[*]}; then
                error "Could not read settings for port ${port}"
                return ${EXIT_ERROR}
        fi
@@ -76,7 +109,7 @@ hook_default_edit() {
        fi
 
        # Save settings
-       if ! port_settings_write "${port}" ${HOOK_SETTINGS}; then
+       if ! port_settings_write "${port}" ${HOOK_SETTINGS[*]}; then
                error "Could not write settings for port ${port}"
                return ${EXIT_ERROR}
        fi
@@ -95,7 +128,7 @@ hook_edit() {
 hook_children() {
        local port="${1}"
 
-       if ! port_settings_read "${port}" ${HOOK_SETTINGS}; then
+       if ! port_settings_read "${port}" ${HOOK_SETTINGS[*]}; then
                log ERROR "Could not read port settings: ${port}"
                return ${EXIT_OK}
        fi