Changeset 8a9a41e in mainline for uspace/app/inet/inet.c

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/app/inet/inet.c (modified) (4 diffs)

uspace/app/inet/inet.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #include <errno.h>
 #include <inet/addr.h>
+#include <inet/eth_addr.h>
 #include <inet/inetcfg.h>
 #include <io/table.h>
@@ -340 +341 @@
         inet_link_info_t linfo;
         table_t *table = NULL;
+        eth_addr_str_t saddr;
 
         size_t count;
@@ -368 +370 @@
                 }
 
-                table_printf(table, "%02x:%02x:%02x:%02x:%02x:%02x\t"
-                    "%s\t" "%zu\n",
-                    linfo.mac_addr[0], linfo.mac_addr[1],
-                    linfo.mac_addr[2], linfo.mac_addr[3],
-                    linfo.mac_addr[4], linfo.mac_addr[5],
-                    linfo.name, linfo.def_mtu);
+                eth_addr_format(&linfo.mac_addr, &saddr);
+                table_printf(table, "%s\t %s\t %zu\n", saddr.str, linfo.name,
+                    linfo.def_mtu);
 
                 free(linfo.name);