vlan: Add support for 802.1ad (QinQ)

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

diff --git a/src/header-port b/src/header-port
index 6cf0cc9fb83c854b2810cbd9dfa6868319e82245..7d0b2722cbb2ef4bbd7a2b94123cc6bf989ee0d9 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,20 +42,58 @@ hook_hotplug_rename() {
        exit ${EXIT_FALSE}
 }
 
-hook_default_new() {
-       local ${HOOK_SETTINGS}
-       if ! hook_parse_cmdline "$@"; then
+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}
+}
+
+# Returns the suggested name of the port
+hook_find_port_name() {
        assert isset HOOK_PORT_PATTERN
+       port_find_free "${HOOK_PORT_PATTERN}"
+}
+
+hook_default_new() {
+       local ${HOOK_SETTINGS[*]}
+
+       # Import all default variables
+       hook_set_defaults
 
-       local port=$(port_find_free ${HOOK_PORT_PATTERN})
+       if ! hook_parse_cmdline "$@"; then
+               return ${EXIT_ERROR}
+       fi
+
+       # Determine a name for this port
+       local port="$(hook_find_port_name)"
        assert isset port
 
-       port_settings_write "${port}" ${HOOK_SETTINGS}
+       # Save settings
+       if ! port_settings_write "${port}" ${HOOK_SETTINGS[*]}; then
+               return ${EXIT_ERROR}
+       fi
 
-       exit ${EXIT_OK}
+       return ${EXIT_OK}
 }
 
 hook_new() {
@@ -66,7 +106,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
@@ -77,7 +117,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
@@ -96,7 +136,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