diff options
| author | Maxime de Roucy <maxime.deroucy@gmail.com> | 2022-03-07 12:40:57 +0100 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2022-03-11 19:13:04 -0800 |
| commit | 19c0def1f60159c0d90fa183a49dff3186101e6a (patch) | |
| tree | d756aedacef2a4546c507f779afa3363497a0733 | |
| parent | 1808f002dfdd33fc397151c30bcffcef25cb6ae9 (diff) | |
| download | iproute2-19c0def1f60159c0d90fa183a49dff3186101e6a.tar.gz | |
ipaddress: remove 'label' compatibility with Linux-2.0 net aliases
As Linux-2.0 is getting old and systemd allows non Linux-2.0 compatible
aliases to be set, I think iproute2 should be able to manage such
aliases.
Signed-off-by: Maxime de Roucy <maxime.deroucy@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
| -rw-r--r-- | ip/ipaddress.c | 16 | ||||
| -rw-r--r-- | man/man8/ip-address.8.in | 3 |
2 files changed, 0 insertions, 19 deletions
diff --git a/ip/ipaddress.c b/ip/ipaddress.c index 4109d8bd2..a14eb31b8 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -2343,16 +2343,6 @@ static bool ipaddr_is_multicast(inet_prefix *a) return false; } -static bool is_valid_label(const char *dev, const char *label) -{ - size_t len = strlen(dev); - - if (strncmp(label, dev, len) != 0) - return false; - - return label[len] == '\0' || label[len] == ':'; -} - static int ipaddr_modify(int cmd, int flags, int argc, char **argv) { struct { @@ -2495,12 +2485,6 @@ static int ipaddr_modify(int cmd, int flags, int argc, char **argv) fprintf(stderr, "Not enough information: \"dev\" argument is required.\n"); return -1; } - if (l && !is_valid_label(d, l)) { - fprintf(stderr, - "\"label\" (%s) must match \"dev\" (%s) or be prefixed by \"dev\" with a colon.\n", - l, d); - return -1; - } if (peer_len == 0 && local_len) { if (cmd == RTM_DELADDR && lcl.family == AF_INET && !(lcl.flags & PREFIXLEN_SPECIFIED)) { diff --git a/man/man8/ip-address.8.in b/man/man8/ip-address.8.in index a614ac64d..1846252df 100644 --- a/man/man8/ip-address.8.in +++ b/man/man8/ip-address.8.in @@ -195,9 +195,6 @@ is derived by setting/resetting the host bits of the interface prefix. .TP .BI label " LABEL" Each address may be tagged with a label string. -In order to preserve compatibility with Linux-2.0 net aliases, -this string must coincide with the name of the device or must be prefixed -with the device name followed by colon. The maximum allowed total length of label is 15 characters. .TP |