commit 2f581a0c6d88167d7c5635ef8b53287d9609b2ee
author Garrick Evans <garrick@google.com> Mon May 11 10:43:35 2020 +0900
committer Commit Bot <commit-bot@chromium.org> Tue May 12 13:23:37 2020 +0000
tree f48d6b9c8b9f870e7b979aac899af4aa71d1dc67
parent cb09549ee418c90bfdd3e9196f5a70576064cef7

patchpanel: Account for long ifnames

This patch modifies the veth ifname naming function for ARC
container to account for longer device names that, when prefixed, exceed
IFNAMSIZ.

The 'veth' prefix itself must still be used since that's what shill is
paying attention to.

BUG=b:155453410
TEST=units, manual inspection and connectivity check

Change-Id: I3e0abcced0d8a6df1782093e682212a7ce2ae078
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2192631
Tested-by: Garrick Evans <garrick@chromium.org>
Commit-Queue: Garrick Evans <garrick@chromium.org>
Reviewed-by: Taoyu Li <taoyl@chromium.org>
Reviewed-by: Hugo Benichi <hugobenichi@google.com>

patchpanel/arc_service_test.cc

diff --git a/patchpanel/arc_service_test.cc b/patchpanel/arc_service_test.cc
index 6897956..52236e3 100644
--- a/patchpanel/arc_service_test.cc
+++ b/patchpanel/arc_service_test.cc
@@ -246,14 +246,14 @@
       EXPECT_CALL(*datapath_, AddBridge(StrEq("arcbr0"), kArcHostIP, 30))
           .WillOnce(Return(true));
       EXPECT_CALL(*datapath_,
-                  AddVirtualInterfacePair(StrEq("veth_arc0"), StrEq("arc0")))
+                  AddVirtualInterfacePair(StrEq("vetharc0"), StrEq("arc0")))
           .WillOnce(Return(true));
       EXPECT_CALL(*datapath_, ConfigureInterface(StrEq("arc0"), _, kArcGuestIP,
                                                  30, true, _))
           .WillOnce(Return(true));
-      EXPECT_CALL(*datapath_, ToggleInterface(StrEq("veth_arc0"), true))
+      EXPECT_CALL(*datapath_, ToggleInterface(StrEq("vetharc0"), true))
           .WillOnce(Return(true));
-      EXPECT_CALL(*datapath_, AddToBridge(StrEq("arcbr0"), StrEq("veth_arc0")))
+      EXPECT_CALL(*datapath_, AddToBridge(StrEq("arcbr0"), StrEq("vetharc0")))
           .WillOnce(Return(true));
 
       impl->Start(kTestPID);
@@ -284,14 +284,14 @@
   EXPECT_CALL(*datapath_, AddBridge(StrEq("arcbr0"), kArcHostIP, 30))
       .WillOnce(Return(true));
   EXPECT_CALL(*datapath_,
-              AddVirtualInterfacePair(StrEq("veth_arc0"), StrEq("arc0")))
+              AddVirtualInterfacePair(StrEq("vetharc0"), StrEq("arc0")))
       .WillOnce(Return(true));
   EXPECT_CALL(*datapath_,
               ConfigureInterface(StrEq("arc0"), _, kArcGuestIP, 30, true, _))
       .WillOnce(Return(true));
-  EXPECT_CALL(*datapath_, ToggleInterface(StrEq("veth_arc0"), true))
+  EXPECT_CALL(*datapath_, ToggleInterface(StrEq("vetharc0"), true))
       .WillOnce(Return(true));
-  EXPECT_CALL(*datapath_, AddToBridge(StrEq("arcbr0"), StrEq("veth_arc0")))
+  EXPECT_CALL(*datapath_, AddToBridge(StrEq("arcbr0"), StrEq("vetharc0")))
       .WillOnce(Return(true));
   EXPECT_CALL(forwarder_, StartForwarding(_, _, _, _)).Times(0);
   Impl(false)->Start(kTestPID);
@@ -301,7 +301,7 @@
   EXPECT_CALL(*datapath_, AddBridge(StrEq("arcbr0"), kArcHostIP, 30))
       .WillOnce(Return(true));
   EXPECT_CALL(*datapath_,
-              AddVirtualInterfacePair(StrEq("veth_arc0"), StrEq("arc0")))
+              AddVirtualInterfacePair(StrEq("vetharc0"), StrEq("arc0")))
       .WillOnce(Return(false));
   EXPECT_CALL(*datapath_, ConfigureInterface(_, _, _, _, _, _)).Times(0);
   EXPECT_CALL(*datapath_, RemoveBridge(_)).Times(0);
@@ -312,12 +312,12 @@
   EXPECT_CALL(*datapath_, AddBridge(StrEq("arcbr0"), kArcHostIP, 30))
       .WillOnce(Return(true));
   EXPECT_CALL(*datapath_,
-              AddVirtualInterfacePair(StrEq("veth_arc0"), StrEq("arc0")))
+              AddVirtualInterfacePair(StrEq("vetharc0"), StrEq("arc0")))
       .WillOnce(Return(true));
   EXPECT_CALL(*datapath_,
               ConfigureInterface(StrEq("arc0"), _, kArcGuestIP, 30, true, _))
       .WillOnce(Return(false));
-  EXPECT_CALL(*datapath_, ToggleInterface(StrEq("veth_arc0"), true)).Times(0);
+  EXPECT_CALL(*datapath_, ToggleInterface(StrEq("vetharc0"), true)).Times(0);
   EXPECT_CALL(*datapath_, RemoveInterface(StrEq("arc0")));
   EXPECT_CALL(*datapath_, RemoveBridge(_)).Times(0);
   Impl(false)->Start(kTestPID);
@@ -325,15 +325,15 @@
 
 TEST_F(ContainerImplTest, OnStartDevice) {
   EXPECT_CALL(*datapath_,
-              AddVirtualInterfacePair(StrEq("veth_eth0"), StrEq("eth0")))
+              AddVirtualInterfacePair(StrEq("vetheth0"), StrEq("eth0")))
       .WillOnce(Return(true));
   EXPECT_CALL(*datapath_,
               ConfigureInterface(StrEq("eth0"), _, Ipv4Addr(100, 115, 92, 10),
                                  30, true, _))
       .WillOnce(Return(true));
-  EXPECT_CALL(*datapath_, ToggleInterface(StrEq("veth_eth0"), true))
+  EXPECT_CALL(*datapath_, ToggleInterface(StrEq("vetheth0"), true))
       .WillOnce(Return(true));
-  EXPECT_CALL(*datapath_, AddToBridge(StrEq("arc_eth0"), StrEq("veth_eth0")))
+  EXPECT_CALL(*datapath_, AddToBridge(StrEq("arc_eth0"), StrEq("vetheth0")))
       .WillOnce(Return(true));
   EXPECT_CALL(forwarder_,
               StartForwarding(StrEq("eth0"), StrEq("arc_eth0"), _, _));
@@ -345,14 +345,14 @@
 TEST_F(ContainerImplTest, Stop) {
   EXPECT_CALL(*datapath_,
               MaskInterfaceFlags(StrEq("arcbr0"), IFF_DEBUG, IFF_UP));
-  EXPECT_CALL(*datapath_, RemoveInterface(StrEq("veth_arc0")));
+  EXPECT_CALL(*datapath_, RemoveInterface(StrEq("vetharc0")));
   EXPECT_CALL(forwarder_, StopForwarding(_, _, _, _)).Times(0);
 
   Impl()->Stop(kTestPID);
 }
 
 TEST_F(ContainerImplTest, OnStopDevice) {
-  EXPECT_CALL(*datapath_, RemoveInterface(StrEq("veth_eth0")));
+  EXPECT_CALL(*datapath_, RemoveInterface(StrEq("vetheth0")));
   EXPECT_CALL(forwarder_,
               StopForwarding(StrEq("eth0"), StrEq("arc_eth0"), _, _));