Skip to contentSkip to conversation

SIOCSIFNAME wildcard support (resend)

PATCH In review Jean Tourrilhes 3 participants 5 messages Feb 8, 2005 Networking

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 SIOCSIFNAME wildcard support (resend)

Hi Marcelo,

I did not receive any feedback on this e-mail, so I assume it
was lost on the way. Would you mind pushing that in 2.4.x ?

	Thanks...

	Jean

----- Forwarded message from jt -----

Subject: [PATCH 2.4] SIOCSIFNAME wildcard support
E-mail: [email protected]

Hi Marcelo,

This patch adds wildcard support for the SIOCSIFNAME ioctl,
like what was done in 2.6.1. SIOCSIFNAME allow a user space tool to change network interface names (such as nameif, ifrename, or ip link), this patch allow those tools to specify a pattern, such as "eth%d" or "wlan%d", and the kernel use the lowest available slot.
The reason I'm sending you this patch is that I've got some
2.4.X users who requested the feature...
This patch was initially done for 2.4.23, and I rediffed and
retested with 2.4.29. It's somewhat different from the patch Stephen and me added to 2.6.1, because the netdev init code is different and also this patch is more conservative.

	Have fun...

	Jean

-------------------------------------------------------------

net/core/dev.c renamed from net/core/dev.j1.c +21 -5
diff -u -p linux/net/core/dev.j1.c linux/net/core/dev.c
@@ -2179,10 +2179,26 @@ static int dev_ifsioc(struct ifreq *ifr,
 		case SIOCSIFNAME:
 			if (dev->flags&IFF_UP)
 				return -EBUSY;
-			if (__dev_get_by_name(ifr->ifr_newname))
-				return -EEXIST;
-			memcpy(dev->name, ifr->ifr_newname, IFNAMSIZ);
-			dev->name[IFNAMSIZ-1] = 0;
+			/* Check if name contains a wildcard */
+			if (strchr(ifr->ifr_newname, '%')) {
+				char format[IFNAMSIZ + 1];
+				int ret;
+				memcpy(format, ifr->ifr_newname, IFNAMSIZ);
+				format[IFNAMSIZ-1] = 0;
+				/* Find a free name based on format.
+				 * dev_alloc_name() replaces "%d" with at max
+				 * 2 digits, so no name overflow. - Jean II */
+				ret = dev_alloc_name(dev, format);
+				if (ret < 0)
+					return ret;
+				/* Copy the new name back to caller. */
+				strncpy(ifr->ifr_newname, dev->name, IFNAMSIZ);
+			} else {
+				if (__dev_get_by_name(ifr->ifr_newname))
+					return -EEXIST;
+				memcpy(dev->name, ifr->ifr_newname, IFNAMSIZ);
+				dev->name[IFNAMSIZ-1] = 0;
+			}
 			notifier_call_chain(&netdev_chain, NETDEV_CHANGENAME, dev);
 			return 0;
 
@@ -2315,6 +2331,7 @@ int dev_ioctl(unsigned int cmd, void *ar
 		 *	- return a value
 		 */
 		 
+		case SIOCSIFNAME:
 		case SIOCGMIIPHY:
 		case SIOCGMIIREG:
 			if (!capable(CAP_NET_ADMIN))
@@ -2350,7 +2367,6 @@ int dev_ioctl(unsigned int cmd, void *ar
 		case SIOCDELMULTI:
 		case SIOCSIFHWBROADCAST:
 		case SIOCSIFTXQLEN:
-		case SIOCSIFNAME:
 		case SIOCSMIIREG:
 		case SIOCBONDENSLAVE:
 		case SIOCBONDRELEASE:
#1 lore raw

Hi Jean,

Quoted 5 lines · Jean Tourrilhes

Hi Marcelo,

I did not receive any feedback on this e-mail, so I assume it
was lost on the way. Would you mind pushing that in 2.4.x ?

	Thanks...

As an ignorant person I have no problems with it.

David, what is your opinion?

Quoted 78 lines

Jean

----- Forwarded message from jt -----

Subject: [PATCH 2.4] SIOCSIFNAME wildcard support
E-mail: [email protected]

Hi Marcelo,

This patch adds wildcard support for the SIOCSIFNAME ioctl,
like what was done in 2.6.1. SIOCSIFNAME allow a user space tool to change network interface names (such as nameif, ifrename, or ip link), this patch allow those tools to specify a pattern, such as "eth%d" or "wlan%d", and the kernel use the lowest available slot.
The reason I'm sending you this patch is that I've got some
2.4.X users who requested the feature...
This patch was initially done for 2.4.23, and I rediffed and
retested with 2.4.29. It's somewhat different from the patch Stephen and me added to 2.6.1, because the netdev init code is different and also this patch is more conservative.

	Have fun...

	Jean

-------------------------------------------------------------

diff -u -p linux/net/core/dev.j1.c linux/net/core/dev.c

net/core/dev.c renamed from net/core/dev.j1.c +21 -6
@@ -2179,10 +2179,26 @@ static int dev_ifsioc(struct ifreq *ifr,
 		case SIOCSIFNAME:
 			if (dev->flags&IFF_UP)
 				return -EBUSY;
-			if (__dev_get_by_name(ifr->ifr_newname))
-				return -EEXIST;
-			memcpy(dev->name, ifr->ifr_newname, IFNAMSIZ);
-			dev->name[IFNAMSIZ-1] = 0;
+			/* Check if name contains a wildcard */
+			if (strchr(ifr->ifr_newname, '%')) {
+				char format[IFNAMSIZ + 1];
+				int ret;
+				memcpy(format, ifr->ifr_newname, IFNAMSIZ);
+				format[IFNAMSIZ-1] = 0;
+				/* Find a free name based on format.
+				 * dev_alloc_name() replaces "%d" with at max
+				 * 2 digits, so no name overflow. - Jean II */
+				ret = dev_alloc_name(dev, format);
+				if (ret < 0)
+					return ret;
+				/* Copy the new name back to caller. */
+				strncpy(ifr->ifr_newname, dev->name, IFNAMSIZ);
+			} else {
+				if (__dev_get_by_name(ifr->ifr_newname))
+					return -EEXIST;
+				memcpy(dev->name, ifr->ifr_newname, IFNAMSIZ);
+				dev->name[IFNAMSIZ-1] = 0;
+			}
 			notifier_call_chain(&netdev_chain, NETDEV_CHANGENAME, dev);
 			return 0;
 
@@ -2315,6 +2331,7 @@ int dev_ioctl(unsigned int cmd, void *ar
 		 *	- return a value
 		 */
 
+		case SIOCSIFNAME:
 		case SIOCGMIIPHY:
 		case SIOCGMIIREG:
 			if (!capable(CAP_NET_ADMIN))
@@ -2350,7 +2367,6 @@ int dev_ioctl(unsigned int cmd, void *ar
 		case SIOCDELMULTI:
 		case SIOCSIFHWBROADCAST:
 		case SIOCSIFTXQLEN:
-		case SIOCSIFNAME:
 		case SIOCSMIIREG:
 		case SIOCBONDENSLAVE:
 		case SIOCBONDRELEASE:
-
maintainer
#2 lore raw
Quoted 10 lines · On Tue, 8 Feb 2005 16:04:45 -0200 Marcelo Tosatti…
Quoted 5 lines · Jean Tourrilhes

Hi Marcelo,

I did not receive any feedback on this e-mail, so I assume it
was lost on the way. Would you mind pushing that in 2.4.x ?

	Thanks...

As an ignorant person I have no problems with it.

David, what is your opinion?

If networking patches are sent purely to linux-kernel, they will often be missed. Please use [email protected], Jean of all people should be more than aware of [email protected] as the place to post and discuss networking patches, not linux-kernel and not privately to Marcelo or myself.

I only happened to spot this post by accident this time, I'm being asked a question and I'm not even CC:'d on the email. :-)

#3 lore raw
Quoted 14 lines · David S. Miller
Quoted 10 lines · On Tue, 8 Feb 2005 16:04:45 -0200 Marcelo Tosatti…
Quoted 5 lines · Jean Tourrilhes

Hi Marcelo,

I did not receive any feedback on this e-mail, so I assume it
was lost on the way. Would you mind pushing that in 2.4.x ?

	Thanks...

As an ignorant person I have no problems with it.

David, what is your opinion?

Quoted 8 lines

If networking patches are sent purely to linux-kernel, they will often be missed. Please use [email protected], Jean of all people should be more than aware of [email protected] as the place to post and discuss networking patches, not linux-kernel and not privately to Marcelo or myself.

I only happened to spot this post by accident this time, I'm being asked a question and I'm not even CC:'d on the email. :-)

It was sent to netdev :
http://marc.theaimsgroup.com/?l=linux-netdev&m=110747857226852&w=2

Jean