Skip to contentSkip to conversation

ipaddress: remove 'label' compatibility with Linux-2.0 net aliases

PATCH In review [email protected] 2 participants 5 messages Mar 3, 2022 – Mar 7, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.
---
 ip/ipaddress.c           | 16 ---------------- man/man8/ip-address.8.in |  3 ---

 2 files changed, 19 deletions(-)
ip/ipaddress.c +0 -0
index 739b0b9c..a80996ef 100644
@@ -2349,16 +2349,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 {
@@ -2501,12 +2491,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)) {

man/man8/ip-address.8.in +0 -0
index a614ac64..1846252d 100644
@@ -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

#1 lore raw
Quoted 7 lines · On Thu, 03 Mar 2022 23:14:55 +0100 [email protected] wrote:

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.
---
 ip/ipaddress.c           | 16 ---------------- man/man8/ip-address.8.in |  3 ---

 2 files changed, 19 deletions(-)

Agree that iproute2 shouldn't enforce restrictions that kernel does not.

#2 lore raw
In reply to [email protected]
Quoted 7 lines · On Thu, 03 Mar 2022 23:14:55 +0100 [email protected] wrote:

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.
---
 ip/ipaddress.c           | 16 ---------------- man/man8/ip-address.8.in |  3 ---

 2 files changed, 19 deletions(-)

Sorry, this patch is missing Signed-off-by:

Please resubmit and run it through checkpatch to make sure it is correct format.

ERROR: patch seems to be corrupt (line wrapped?)
#93: FILE: ip/ipaddress.c:2348:
                return false;

ERROR: Missing Signed-off-by: line(s)

total: 2 errors, 0 warnings, 43 lines checked

#3 lore raw

PATCH 1/1 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.

---
 ip/ipaddress.c           | 16 ----------------
 man/man8/ip-address.8.in |  3 ---
 2 files changed, 19 deletions(-)
ip/ipaddress.c +0 -16
index 739b0b9c..a80996ef 100644
@@ -2349,16 +2349,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 {
@@ -2501,12 +2491,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)) {
man/man8/ip-address.8.in +0 -3
index a614ac64..1846252d 100644
@@ -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
Signature · 1 line
2.35.1
#4 lore raw

PATCH v2 1/1 ipaddress: remove 'label' compatibility with Linux-2.0 net aliases

In reply to Stephen Hemminger

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.

---
 ip/ipaddress.c           | 16 ----------------
 man/man8/ip-address.8.in |  3 ---
 2 files changed, 19 deletions(-)
ip/ipaddress.c +0 -16
index 739b0b9c..a80996ef 100644
@@ -2349,16 +2349,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 {
@@ -2501,12 +2491,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)) {
man/man8/ip-address.8.in +0 -3
index a614ac64..1846252d 100644
@@ -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
Signature · 1 line
2.35.1