colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: adjust format for nm_platform_lnk_tun_to_string() and print "persist"

Browse Source 
Switch from "pi on|off" to optinally printing "pi" to indicate
whether the flag is set. That follows ip-tuntap syntax and is
more familiar:

    $ ip tuntap help
    Usage: ip tuntap { add | del | show | list | lst | help } [ dev PHYS_DEV ]
              [ mode { tun | tap } ] [ user USER ] [ group GROUP ]
              [ one_queue ] [ pi ] [ vnet_hdr ] [ multi_queue ] [ name NAME ]

    Where: USER  := { STRING | NUMBER }
           GROUP := { STRING | NUMBER }

Also, print the "persist" flag.
This commit is contained in:
Thomas Haller
2018-04-05 14:51:34 +02:00
parent 530b5755ad
commit 01ad4f33ed
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/platform/nm-platform.c
View File

@@ -5121,16 +5121,18 @@ nm_platform_lnk_tun_to_string (const NMPlatformLnkTun *lnk, char *buf, gsize len
g_snprintf (buf, len, g_snprintf (buf, len,
"%s" /* type */ "%s" /* type */
" pi %s" /* pi */ "%s" /* pi */
" vnet_hdr %s" /* vnet_hdr */ "%s" /* vnet_hdr */
"%s" /* multi_queue */ "%s" /* multi_queue */
"%s" /* persist */
"%s" /* owner */ "%s" /* owner */
"%s" /* group */ "%s" /* group */
"", "",
type, type,
lnk->pi ? "on" : "off", lnk->pi ? " pi" : "",
lnk->vnet_hdr ? "on" : "off", lnk->vnet_hdr ? " vnet_hdr" : "",
lnk->multi_queue ? " multi_queue" : "", lnk->multi_queue ? " multi_queue" : "",
lnk->persist ? " persist" : "",
lnk->owner_valid ? nm_sprintf_buf (str_owner, " owner %u", (guint) lnk->owner) : "", lnk->owner_valid ? nm_sprintf_buf (str_owner, " owner %u", (guint) lnk->owner) : "",
lnk->group_valid ? nm_sprintf_buf (str_group, " group %u", (guint) lnk->group) : ""); lnk->group_valid ? nm_sprintf_buf (str_group, " group %u", (guint) lnk->group) : "");
return buf; return buf;