Skip to content

L
lxc
Unverified Commit aa2fdfd3 by hn Committed by Christian Brauner
Options

network: prefix veth interface name with uid info

Signed-off-by: 's avatarHajo Noerenberg <hajo-github@noerenberg.de> Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 2fa5dff9
Showing with 7 additions and 1 deletion
src/lxc/cmd/lxc_user_nic.c
...@@ -711,6 +711,7 @@ static char *get_nic_if_avail(int fd, struct alloted_s *names, int pid, ...@@ -711,6 +711,7 @@ static char *get_nic_if_avail(int fd, struct alloted_s *names, int pid,
struct stat sb; struct stat sb;
struct alloted_s *n; struct alloted_s *n;
char *buf = NULL; char *buf = NULL;
uid_t uid;
for (n = names; n != NULL; n = n->next) for (n = names; n != NULL; n = n->next)
cull_entries(fd, n->name, intype, br, NULL, NULL); cull_entries(fd, n->name, intype, br, NULL, NULL);
...@@ -753,7 +754,12 @@ static char *get_nic_if_avail(int fd, struct alloted_s *names, int pid, ...@@ -753,7 +754,12 @@ static char *get_nic_if_avail(int fd, struct alloted_s *names, int pid,
if (!owner) if (!owner)
return NULL; return NULL;
ret = snprintf(nicname, sizeof(nicname), "vethXXXXXX"); uid = getuid();
/* for POSIX integer uids the network device name schema is vethUID_XXXXX */
if (uid > 0 && uid <= 65536)
ret = snprintf(nicname, sizeof(nicname), "veth%d_XXXXX", uid);
else
ret = snprintf(nicname, sizeof(nicname), "vethXXXXXX");
if (ret < 0 || (size_t)ret >= sizeof(nicname)) if (ret < 0 || (size_t)ret >= sizeof(nicname))
return NULL; return NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment