Browse Source

Link: rename attr 'hwaddr' to 'address' to match IFLA_*

Fabian Peter Hammerle 7 years ago
parent
commit
2e74587136
3 changed files with 7 additions and 7 deletions
  1. 3 3
      README.md
  2. 3 3
      link.cpp
  3. 1 1
      link.h

+ 3 - 3
README.md

@@ -14,15 +14,15 @@ apt install libmnl-dev linux-libc-dev g++
 $ ipyml
 
 - ifname: lo
-  hwaddr: 00:00:00:00:00:00
+  address: 00:00:00:00:00:00
   broadcast: 00:00:00:00:00:00
   operstate: unknown
 - ifname: eth0
-  hwaddr: 11:22:33:44:55:66
+  address: 11:22:33:44:55:66
   broadcast: ff:ff:ff:ff:ff:ff
   operstate: down
 - ifname: wlan0
-  hwaddr: 77:88:99:00:aa:bb
+  address: 77:88:99:00:aa:bb
   broadcast: ff:ff:ff:ff:ff:ff
   operstate: up
 

+ 3 - 3
link.cpp

@@ -10,7 +10,7 @@ int Link::mnl_attr_cb(const nlattr *attr, void *data) {
   Link *link = (Link *)data;
   switch (mnl_attr_get_type(attr)) {
   case IFLA_ADDRESS:
-    link->hwaddr = attr;
+    link->address = attr;
     break;
   case IFLA_BROADCAST:
     link->broadcast = attr;
@@ -29,8 +29,8 @@ void Link::write_yaml(std::ostream &stream,
                       const yaml_indent_level_t indent_level) const {
   const std::string indent(indent_level, ' ');
   stream << "ifname: " + ifname + "\n";
-  stream << indent + "hwaddr: ";
-  hwaddr.write_yaml(stream);
+  stream << indent + "address: ";
+  address.write_yaml(stream);
   stream << "\n";
   stream << indent + "broadcast: ";
   broadcast.write_yaml(stream);

+ 1 - 1
link.h

@@ -11,7 +11,7 @@
 
 class Link : public YamlObject {
   std::string ifname;
-  HardwareAddress hwaddr, broadcast;
+  HardwareAddress address, broadcast;
   OperState operstate;
 
 public: