libnetdevice: migrate API to std::string_view
Bug: 372814636
Test: verified with b/372814636 test service
Change-Id: I9a6226a914195e895193b8a4c2d4d833fcc5dade
diff --git a/automotive/can/1.0/default/libnetdevice/can.cpp b/automotive/can/1.0/default/libnetdevice/can.cpp
index 2a0545a..8d82c36 100644
--- a/automotive/can/1.0/default/libnetdevice/can.cpp
+++ b/automotive/can/1.0/default/libnetdevice/can.cpp
@@ -33,7 +33,7 @@
static constexpr can_err_mask_t kErrMask = CAN_ERR_MASK;
-base::unique_fd socket(const std::string& ifname) {
+base::unique_fd socket(std::string_view ifname) {
sockaddr_can addr = {};
addr.can_family = AF_CAN;
addr.can_ifindex = nametoindex(ifname);
@@ -66,7 +66,7 @@
return sock;
}
-bool setBitrate(std::string ifname, uint32_t bitrate) {
+bool setBitrate(std::string_view ifname, uint32_t bitrate) {
can_bittiming bt = {};
bt.bitrate = bitrate;
diff --git a/automotive/can/1.0/default/libnetdevice/common.cpp b/automotive/can/1.0/default/libnetdevice/common.cpp
index 28e50af..22add65 100644
--- a/automotive/can/1.0/default/libnetdevice/common.cpp
+++ b/automotive/can/1.0/default/libnetdevice/common.cpp
@@ -22,8 +22,8 @@
namespace android::netdevice {
-unsigned int nametoindex(const std::string& ifname) {
- const auto ifidx = if_nametoindex(ifname.c_str());
+unsigned int nametoindex(std::string_view ifname) {
+ const auto ifidx = if_nametoindex(std::string(ifname).c_str());
if (ifidx != 0) return ifidx;
if (errno != ENODEV) {
diff --git a/automotive/can/1.0/default/libnetdevice/common.h b/automotive/can/1.0/default/libnetdevice/common.h
index 661e3f8..e73c581 100644
--- a/automotive/can/1.0/default/libnetdevice/common.h
+++ b/automotive/can/1.0/default/libnetdevice/common.h
@@ -32,6 +32,6 @@
* \param ifname Interface to check
* \return Interface index, or 0 if the interface doesn't exist
*/
-unsigned int nametoindex(const std::string& ifname);
+unsigned int nametoindex(std::string_view ifname);
} // namespace android::netdevice
diff --git a/automotive/can/1.0/default/libnetdevice/ethtool.cpp b/automotive/can/1.0/default/libnetdevice/ethtool.cpp
index 832eb5c..b0f88c7 100644
--- a/automotive/can/1.0/default/libnetdevice/ethtool.cpp
+++ b/automotive/can/1.0/default/libnetdevice/ethtool.cpp
@@ -23,7 +23,7 @@
namespace android::netdevice::ethtool {
-std::optional<uint32_t> getValue(const std::string& ifname, uint32_t command) {
+std::optional<uint32_t> getValue(std::string_view ifname, uint32_t command) {
struct ethtool_value valueop = {};
valueop.cmd = command;
@@ -34,7 +34,7 @@
return valueop.data;
}
-bool setValue(const std::string& ifname, uint32_t command, uint32_t value) {
+bool setValue(std::string_view ifname, uint32_t command, uint32_t value) {
struct ethtool_value valueop = {};
valueop.cmd = command;
valueop.data = value;
diff --git a/automotive/can/1.0/default/libnetdevice/ifreqs.cpp b/automotive/can/1.0/default/libnetdevice/ifreqs.cpp
index 7dbd8fb..2e6ad41 100644
--- a/automotive/can/1.0/default/libnetdevice/ifreqs.cpp
+++ b/automotive/can/1.0/default/libnetdevice/ifreqs.cpp
@@ -70,10 +70,11 @@
return true;
}
-struct ifreq fromName(const std::string& ifname) {
+struct ifreq fromName(std::string_view ifname) {
struct ifreq ifr = {};
- // strncpy: last \0 initialized with ifreq above
- strncpy(ifr.ifr_name, ifname.c_str(), IF_NAMESIZE - 1);
+ // memcpy: last \0 initialized with ifreq above
+ memcpy(ifr.ifr_name, ifname.data(),
+ std::min(ifname.size(), static_cast<size_t>(IF_NAMESIZE - 1)));
return ifr;
}
diff --git a/automotive/can/1.0/default/libnetdevice/ifreqs.h b/automotive/can/1.0/default/libnetdevice/ifreqs.h
index aa7030b..f9d8d3b 100644
--- a/automotive/can/1.0/default/libnetdevice/ifreqs.h
+++ b/automotive/can/1.0/default/libnetdevice/ifreqs.h
@@ -52,6 +52,6 @@
* \param ifname Interface to initialize request with
* \return Interface request with ifr_name field set to ifname
*/
-struct ifreq fromName(const std::string& ifname);
+struct ifreq fromName(std::string_view ifname);
} // namespace android::netdevice::ifreqs
diff --git a/automotive/can/1.0/default/libnetdevice/include/libnetdevice/can.h b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/can.h
index 3886acf..6045733 100644
--- a/automotive/can/1.0/default/libnetdevice/include/libnetdevice/can.h
+++ b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/can.h
@@ -28,7 +28,7 @@
* \param ifname Interface to open a socket against
* \return Socket's FD or -1 in case of failure
*/
-base::unique_fd socket(const std::string& ifname);
+base::unique_fd socket(std::string_view ifname);
/**
* Sets CAN interface bitrate.
@@ -36,6 +36,6 @@
* \param ifname Interface for which the bitrate is to be set
* \return true on success, false on failure
*/
-bool setBitrate(std::string ifname, uint32_t bitrate);
+bool setBitrate(std::string_view ifname, uint32_t bitrate);
} // namespace android::netdevice::can
diff --git a/automotive/can/1.0/default/libnetdevice/include/libnetdevice/ethtool.h b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/ethtool.h
index 26bfdce..416108f 100644
--- a/automotive/can/1.0/default/libnetdevice/include/libnetdevice/ethtool.h
+++ b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/ethtool.h
@@ -29,7 +29,7 @@
* \param command Fetch command (ETHTOOL_G*)
* \return value, or nullopt if fetch failed
*/
-std::optional<uint32_t> getValue(const std::string& ifname, uint32_t command);
+std::optional<uint32_t> getValue(std::string_view ifname, uint32_t command);
/**
* Set a single value with ethtool_value.
@@ -40,6 +40,6 @@
* \param value New value
* \return true if succeeded, false otherwise
*/
-bool setValue(const std::string& ifname, uint32_t command, uint32_t value);
+bool setValue(std::string_view ifname, uint32_t command, uint32_t value);
} // namespace android::netdevice::ethtool
diff --git a/automotive/can/1.0/default/libnetdevice/include/libnetdevice/libnetdevice.h b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/libnetdevice.h
index 657f9b2..4c5be04 100644
--- a/automotive/can/1.0/default/libnetdevice/include/libnetdevice/libnetdevice.h
+++ b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/libnetdevice.h
@@ -43,7 +43,7 @@
* \param ifname Interface to check
* \return true if it exists, false otherwise
*/
-bool exists(std::string ifname);
+bool exists(std::string_view ifname);
/**
* Checks if network interface is up.
@@ -51,7 +51,7 @@
* \param ifname Interface to check
* \return true/false if the check succeeded, nullopt otherwise
*/
-std::optional<bool> isUp(std::string ifname);
+std::optional<bool> isUp(std::string_view ifname);
/**
* Interface condition to wait for.
@@ -101,7 +101,7 @@
* \param ifname Interface to bring up
* \return true in case of success, false otherwise
*/
-bool up(std::string ifname);
+bool up(std::string_view ifname);
/**
* Brings network interface down.
@@ -109,7 +109,7 @@
* \param ifname Interface to bring down
* \return true in case of success, false otherwise
*/
-bool down(std::string ifname);
+bool down(std::string_view ifname);
/**
* Adds virtual link.
@@ -118,7 +118,7 @@
* \param type the type of the new device
* \return true in case of success, false otherwise
*/
-bool add(std::string dev, std::string type);
+bool add(std::string_view dev, std::string_view type);
/**
* Deletes virtual link.
@@ -126,7 +126,7 @@
* \param dev the name of the device to remove
* \return true in case of success, false otherwise
*/
-bool del(std::string dev);
+bool del(std::string_view dev);
/**
* Fetches interface's hardware address.
@@ -134,7 +134,7 @@
* \param ifname Interface name
* \return Hardware address (MAC address) or nullopt if the lookup failed
*/
-std::optional<hwaddr_t> getHwAddr(const std::string& ifname);
+std::optional<hwaddr_t> getHwAddr(std::string_view ifname);
/**
* Changes interface's hardware address.
@@ -142,7 +142,7 @@
* \param ifname Interface name
* \param hwaddr New hardware address to set
*/
-bool setHwAddr(const std::string& ifname, hwaddr_t hwaddr);
+bool setHwAddr(std::string_view ifname, hwaddr_t hwaddr);
} // namespace android::netdevice
diff --git a/automotive/can/1.0/default/libnetdevice/include/libnetdevice/vlan.h b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/vlan.h
index 3e1b736..884b704 100644
--- a/automotive/can/1.0/default/libnetdevice/include/libnetdevice/vlan.h
+++ b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/vlan.h
@@ -20,6 +20,6 @@
namespace android::netdevice::vlan {
-bool add(const std::string& eth, const std::string& vlan, uint16_t id);
+bool add(std::string_view eth, std::string_view vlan, uint16_t id);
} // namespace android::netdevice::vlan
diff --git a/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp b/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp
index e5a5719..d655259 100644
--- a/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp
+++ b/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp
@@ -38,25 +38,25 @@
ifreqs::socketDomain = domain;
}
-bool exists(std::string ifname) {
+bool exists(std::string_view ifname) {
return nametoindex(ifname) != 0;
}
-bool up(std::string ifname) {
+bool up(std::string_view ifname) {
auto ifr = ifreqs::fromName(ifname);
if (!ifreqs::send(SIOCGIFFLAGS, ifr)) return false;
ifr.ifr_flags |= IFF_UP;
return ifreqs::send(SIOCSIFFLAGS, ifr);
}
-bool down(std::string ifname) {
+bool down(std::string_view ifname) {
auto ifr = ifreqs::fromName(ifname);
if (!ifreqs::send(SIOCGIFFLAGS, ifr)) return false;
ifr.ifr_flags &= ~IFF_UP;
return ifreqs::send(SIOCSIFFLAGS, ifr);
}
-bool add(std::string dev, std::string type) {
+bool add(std::string_view dev, std::string_view type) {
nl::MessageFactory<ifinfomsg> req(RTM_NEWLINK,
NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL | NLM_F_ACK);
req.add(IFLA_IFNAME, dev);
@@ -70,7 +70,7 @@
return sock.send(req) && sock.receiveAck(req);
}
-bool del(std::string dev) {
+bool del(std::string_view dev) {
nl::MessageFactory<ifinfomsg> req(RTM_DELLINK, NLM_F_REQUEST | NLM_F_ACK);
req.add(IFLA_IFNAME, dev);
@@ -78,7 +78,7 @@
return sock.send(req) && sock.receiveAck(req);
}
-std::optional<hwaddr_t> getHwAddr(const std::string& ifname) {
+std::optional<hwaddr_t> getHwAddr(std::string_view ifname) {
auto ifr = ifreqs::fromName(ifname);
if (!ifreqs::send(SIOCGIFHWADDR, ifr)) return std::nullopt;
@@ -87,7 +87,7 @@
return hwaddr;
}
-bool setHwAddr(const std::string& ifname, hwaddr_t hwaddr) {
+bool setHwAddr(std::string_view ifname, hwaddr_t hwaddr) {
auto ifr = ifreqs::fromName(ifname);
// fetch sa_family
@@ -97,13 +97,13 @@
return ifreqs::send(SIOCSIFHWADDR, ifr);
}
-std::optional<bool> isUp(std::string ifname) {
+std::optional<bool> isUp(std::string_view ifname) {
auto ifr = ifreqs::fromName(ifname);
if (!ifreqs::send(SIOCGIFFLAGS, ifr)) return std::nullopt;
return ifr.ifr_flags & IFF_UP;
}
-static bool hasIpv4(std::string ifname) {
+static bool hasIpv4(std::string_view ifname) {
auto ifr = ifreqs::fromName(ifname);
switch (ifreqs::trySend(SIOCGIFADDR, ifr)) {
case 0:
diff --git a/automotive/can/1.0/default/libnetdevice/vlan.cpp b/automotive/can/1.0/default/libnetdevice/vlan.cpp
index 35b21b8..a437c32 100644
--- a/automotive/can/1.0/default/libnetdevice/vlan.cpp
+++ b/automotive/can/1.0/default/libnetdevice/vlan.cpp
@@ -26,7 +26,7 @@
namespace android::netdevice::vlan {
-bool add(const std::string& eth, const std::string& vlan, uint16_t id) {
+bool add(std::string_view eth, std::string_view vlan, uint16_t id) {
const auto ethidx = nametoindex(eth);
if (ethidx == 0) {
LOG(ERROR) << "Ethernet interface " << eth << " doesn't exist";