1. 18 Apr, 2019 36 commits
    • Thomas Haller's avatar
      shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core · 284ac92e
      Thomas Haller authored
      "libnm-core" implements common functionality for "NetworkManager" and
      Note that clients like "nmcli" cannot access the internal API provided
      by "libnm-core". So, if nmcli wants to do something that is also done by
      "libnm-core", , "libnm", or "NetworkManager", the code would have to be
      Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
      Note that:
        0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
           On the other hand, "libnm-libnm-core-aux.la" is not used by
           libnm-core, but provides utilities on top of it.
        1) they both extend "libnm-core" with utlities that are not public
           API of libnm itself. Maybe part of the code should one day become
           public API of libnm. On the other hand, this is code for which
           we may not want to commit to a stable interface or which we
           don't want to provide as part of the API.
        2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
           and thus directly available to "libnm" and "NetworkManager".
           On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
           and "NetworkManager".
           Both libraries may be statically linked by libnm clients (like
        3) it must only use glib, libnm-glib-aux.la, and the public API
           of libnm-core.
           This is important: it must not use "libnm-core/nm-core-internal.h"
           nor "libnm-core/nm-utils-private.h" so the static library is usable
           by nmcli which couldn't access these.
      Note that "shared/nm-meta-setting.c" is an entirely different case,
      because it behaves differently depending on whether linking against
      "libnm-core" or the client programs. As such, this file must be compiled
      (cherry picked from commit af07ed01)
    • Thomas Haller's avatar
      shared: move "nm-dbus-compat.h" header to "nm-std-aux/nm-dbus-compat.h" · 87f7e684
      Thomas Haller authored
      (cherry picked from commit 81833358)
    • Thomas Haller's avatar
      shared: move most of "shared/nm-utils" to "shared/nm-glib-aux" · d984b2ce
      Thomas Haller authored
      From the files under "shared/nm-utils" we build an internal library
      that provides glib-based helper utilities.
      Move the files of that basic library to a new subdirectory
      "shared/nm-glib-aux" and rename the helper library "libnm-core-base.la"
      to "libnm-glib-aux.la".
       - the name "utils" is overused in our code-base. Everything's an
         "utils". Give this thing a more distinct name.
       - there were additional files under "shared/nm-utils", which are not
         part of this internal library "libnm-utils-base.la". All the files
         that are part of this library should be together in the same
         directory, but files that are not, should not be there.
       - the new name should better convey what this library is and what is isn't:
         it's a set of utilities and helper functions that extend glib with
         funcitonality that we commonly need.
      There are still some files left under "shared/nm-utils". They have less
      a unifying propose to be in their own directory, so I leave them there
      for now. But at least they are separate from "shared/nm-glib-aux",
      which has a very clear purpose.
      (cherry picked from commit 80db06f7)
    • Thomas Haller's avatar
      shared: move udev helper to separate directory "shared/nm-udev-aux" · 95621586
      Thomas Haller authored
      We built (among others) two libraries from the sources in "shared/nm-utils":
      "libnm-utils-base.la" and "libnm-utils-udev.la".
      It's confusing. Instead use directories so there is a direct
      correspondence between these internal libraries and the source files.
      (cherry picked from commit 2973d682)
    • Thomas Haller's avatar
      shared: split C-only helper "shared/nm-std-aux" utils out of "shared/nm-utils" · 0a6f21fb
      Thomas Haller authored
      "shared/nm-utils" contains general purpose utility functions that only
      depend on glib (and extend glib with some helper functions).
      We will also add code that does not use glib, hence it would be good
      if the part of "shared/nm-utils" that does not depend on glib, could be
      used by these future projects.
      Also, we use the term "utils" everywhere. While that covers the purpose
      and content well, having everything called "nm-something-utils" is not
      great. Instead, call this "nm-std-aux", inspired by "c-util/c-stdaux".
      (cherry picked from commit b434b9ec)
    • Thomas Haller's avatar
      cli,all: merge branch 'th/strsplit-pt4' · e63f835d
      Thomas Haller authored
      (cherry picked from commit df3c7c3f)
    • Thomas Haller's avatar
      cli: use "escaped-tokens" style for splitting "vlan.xgress-priority-map" list · 5b2d0f0f
      Thomas Haller authored
      There should be little difference here, because the priority list is
      (and was) never serialized with special characters like backslashes or
      delimiters that require escaping.
      Likewise, no working code actually tried to set such characters.
      Still, drop the plain VALUE_STRSPLIT_MODE_STRIPPED and use
      a small set of modes that we use for splitting strings.
      (cherry picked from commit 7f01da91)
    • Thomas Haller's avatar
      cli: cleanup _get_fcn_vlan_xgress_priority_map() · f6237b3f
      Thomas Haller authored
      - merge the pointless helper function vlan_priorities_to_string()
        into the only caller _get_fcn_vlan_xgress_priority_map().
      - minor cleanups, like setting out-is-default if num==0, not
        based on whether we have a non-empty string. There is not difference
        in practice, because nm_setting_vlan_get_priority() never fails.
        Hence they are identical. But nm_setting_vlan_get_priority() has
        an API that allows it to fail, so we should declare the default
        depending on the number of vlan priorities.
      - don't allocate the temporary GString instance if we won't need it.
      - only append the delimiter if needed, and not truncate it afterwards.
        It might have even worse performance this way, but it feels more
        correct to me.
      - also cache the result of nm_setting_vlan_get_num_priorities().
        NMSettingVlan's implementation is horrible and uses a GSList to
        track the list of priorities. This makes it relatively expensive
        to call get-num-priorities repeatedly (and pointless).
      (cherry picked from commit bbfd3668)
    • Thomas Haller's avatar
      cli: unify set of characters to tokenize list properties · 0e54f55c
      Thomas Haller authored
      the only change in behaviour is for VALUE_STRSPLIT_MODE_MULTILIST.
      Previously, we would split at " \t,", now we will also split at
      the white space characters "\n\r\f".
      (cherry picked from commit 7a92fb6b)
    • Thomas Haller's avatar
      shared: remove unused _nm_utils_escape_plain()/_nm_utils_escape_spaces() API · 585077c5
      Thomas Haller authored
      ... and the "unescape" variants.
      This is replaced by nm_utils_escaped_tokens_split()
      and nm_utils_escaped_tokens_escape*() API.
      (cherry picked from commit 304eab87)
    • Thomas Haller's avatar
      ifcfg-rh: use nm_utils_escaped_tokens* for "MATCH_INTERFACE_NAME" · 93eb40ed
      Thomas Haller authored
      For one, use NM_ASCII_SPACES as delimiter when reading
      "MATCH_INTERFACE_NAME". Previously, it was only " \t".
      I think there is no change in behavior otherwise.
      (cherry picked from commit 941f27d3)
    • Thomas Haller's avatar
      cli: refactor multilist property handling of "match.interface-names" · f6d73aff
      Thomas Haller authored
      by "match.interface-names". This uses nm_utils_strsplit_set_full()
      We want eventually to use nm_utils_escaped_tokens_split() everywhere.
      We already have %VALUE_STRSPLIT_MODE_ESCAPED_TOKENS, which splits the
      list at ',' (and strips whitespaces at the around the delimiter). That
      differs from what %VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE did, which
      also considered whitespace a delimiter.
      which replaces the previous mode.
      Note that the previous implementation did almost the same thing. In
      fact, I cannot imagine examples where they behaved differently, but
      my feeling is that there might be some edge cases where this changes
      (cherry picked from commit 6093f493)
    • Thomas Haller's avatar
      cli: return early when splitting with %VALUE_STRSPLIT_MODE_STRIPPED · 53b3e3d7
      Thomas Haller authored
      The reminder of the function only does (something akin to) g_strstrip().
      As we split the strings are spaces to begin with, there is nothing to
      strip and we can return right away.
      (cherry picked from commit b74d9a0b)
    • Thomas Haller's avatar
      cli: drop unused strsplit_with_escape mode for objlist properties · 55a46f91
      Thomas Haller authored
      (cherry picked from commit 3f5df5ab)
    • Thomas Haller's avatar
      cli: assert for proper escaping when creating objlist string · f4a7c2eb
      Thomas Haller authored
      (cherry picked from commit 84bd1d38)
    • Thomas Haller's avatar
      cli: default splitting list properties with escaped-tokens style · 872025d2
      Thomas Haller authored
      When splitting (and concatenating) list-typed properties,
      we really should use nm_utils_escaped_tokens_split()
      and nm_utils_escaped_tokens_escape*().
      Make that the default, and mark all properties to opt-in to the
      legacy behavior.
      (cherry picked from commit 5a715920)
    • Thomas Haller's avatar
      cli: fix splitting of multilist property in setter · 4eaff61f
      Thomas Haller authored
      different. We must use the right mode.
      For example, _get_fcn_match_interface_name() concatenates the interface-names
      with space. So, the tokenizer of the setter must also use space as delimiter.
      (cherry picked from commit 758bf326)
    • Thomas Haller's avatar
      cli: fix handling empty match.interface-name property · c26a4214
      Thomas Haller authored
      (cherry picked from commit 6bef7236)
    • Thomas Haller's avatar
      platform: merge branch 'th/platform-routing-rules-compare' · 30bb93cd
      Thomas Haller authored
      (cherry picked from commit c76aaa94)
    • Thomas Haller's avatar
      platform: compare routing rules according to kernel support for FRA_L3MDEV · 062be85d
      Thomas Haller authored
      Also, in nm_platform_routing_rule_cmp() always compare the routing
      table field, also if l3mdev is set. For kernel, we cannot set table and
      l3mdev together, hence such rules don't really exist (or if we try to
      configure it, it will be rejected by kernel). But as far as
      nm_platform_routing_rule_cmp() is concerned, if the table is set,
      always compare it.
      (cherry picked from commit b6ff02e7)
    • Thomas Haller's avatar
      platform: compare routing rules according to kernel support for FRA_UID_RANGE · d4403913
      Thomas Haller authored
      (cherry picked from commit b843c1ea)
    • Thomas Haller's avatar
      platform: compare routing rules according to kernel support for FRA_IP_PROTO · 11fd01c5
      Thomas Haller authored
      (cherry picked from commit 6a6d982c)
    • Thomas Haller's avatar
      platform: compare routing rules according to kernel support for FRA_PROTOCOL · f9fe2155
      Thomas Haller authored
      For routes and routing rules, kernel uses a certain (not stictly defined) set
      of attributes to decide whether to routes/rules are identical.
      That is a problem, as different kernel versions disagree on whether
      two routes/rules are the same (EEXIST) or not.
      Note that when NetworkManager tries to add a rule with protocol set to
      anything but RTPROT_UNSPEC, then kernel will ignore the attribute if it
      doesn't have support for it. Meaning: the added rule will have a
      different protocol setting then intended.
      Note that NMPRulesManager will add a rule if it doesn't find it in the
      platform cache so far. That means, when looking into the platform cache
      we must ignore or honor the protocol like kernel does.
      This does not only affect FRA_PROTOCOL, but all attributes where kernel
      and NetworkManager disagrees. But the protocol is the most prominent
      one, because the rules tracked by nmp_rules_manager_track_default()
      specify the protocol.
      (cherry picked from commit ef4f8ccf)
    • Thomas Haller's avatar
      platform: detect kernel support for FRA_L3MDEV · a9cf54c4
      Thomas Haller authored
      (cherry picked from commit eba4fd56)
    • Thomas Haller's avatar
      platform: detect kernel support for FRA_UID_RANGE · ff686dd6
      Thomas Haller authored
      (cherry picked from commit 1dd1dcb8)
    • Thomas Haller's avatar
    • Thomas Haller's avatar
      platform: detect kernel support for FRA_PROTOCOL · 6bfce358
      Thomas Haller authored
      (cherry picked from commit cd62d439)
    • Thomas Haller's avatar
      platform: refactor detecting kernel features · bf36fa11
      Thomas Haller authored
      Next we will need to detect more kernel features. First refactor the
      handling of these to require less code changes and be more efficient.
      A plain nm_platform_kernel_support_get() only reqiures to access an
      array in the common case.
      The other important change is that the function no longer requires a
      NMPlatform instance. This allows us to check kernel support from
      anywhere. The only thing is that we require kernel support to be
      initialized before calling this function. That means, an NMPlatform
      instance must have detected support before.
      (cherry picked from commit ee269b31)
    • Beniamino Galvani's avatar
      bridge: merge branch 'bg/bridge-vlan-ranges' · 73e32e43
      Beniamino Galvani authored
      In some cases it is convenient to specify ranges of bridge vlans, as
      already supported by iproute2 and natively by kernel.
      (cherry picked from commit 693252d0)
    • Thomas Haller's avatar
      libnm: minor refactoring of _nm_utils_bridge_vlan_verify_list() · 05a54713
      Thomas Haller authored
      - if there is only one vlan in the list, then we can return success
        early. That is, because one NMBridgeVlan instance is always valid
        due to the way how users must use the API to construct the element.
      - the implementation for check_normalizable is only correct, if there
        are no duplicate or overlapping ranges. Assert for that. In fact,
        all callers first check for errors and then for normalizable errors.
      - avoid duplicate calls to nm_bridge_vlan_get_vid_range(). There are
        duplicate assertions that we don't need.
      - only check for pvid once per range.
      - combine calls to g_hash_table_contains() and g_hash_table_add().
      (cherry picked from commit a358da09)
    • Beniamino Galvani's avatar
      all: use escaped_tokens API for bridge vlans · 6ac953e9
      Beniamino Galvani authored
      (cherry picked from commit 9f23c5e2)
    • Thomas Haller's avatar
      device: avoid multiple allocations in setting_vlans_to_platform() · 11621811
      Thomas Haller authored
      We don't need GPtrArray to construct an array of fixed side.
      Actually, we also don't need to malloc each NMPlatformBridgeVlan
      element individually. Just allocate one buffer and append them
      to the end.
      (cherry picked from commit 6bc8ee87)
    • Beniamino Galvani's avatar
      all: support bridge vlan ranges · da204257
      Beniamino Galvani authored
      In some cases it is convenient to specify ranges of bridge vlans, as
      already supported by iproute2 and natively by kernel. With this commit
      it becomes possible to add a range in this way:
       nmcli connection modify eth0-slave +bridge-port.vlans "100-200 untagged"
      vlan ranges can't be PVIDs because only one PVID vlan can exist.
      (cherry picked from commit 70935157)
    • Beniamino Galvani's avatar
      clients: fix typos · ea8ed6ce
      Beniamino Galvani authored
      (cherry picked from commit ea16cf59)
    • Thomas Haller's avatar
      libnm-core/tests: fix "-Werror=logical-not-parentheses" warning in _sock_addr_endpoint() · fd8b78dd
      Thomas Haller authored
          CC       libnm-core/tests/libnm_core_tests_test_general-test-general.o
        In file included from ../shared/nm-default.h:280:0,
                         from ../libnm-core/tests/test-general.c:24:
        ../libnm-core/tests/test-general.c: In function _sock_addr_endpoint:
        ../libnm-core/tests/test-general.c:5911:18: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses]
          g_assert (!host == (port == -1));
        ../shared/nm-utils/nm-macros-internal.h:1793:7: note: in definition of macro __NM_G_BOOLEAN_EXPR_IMPL
           if (expr) \
        /usr/include/glib-2.0/glib/gmacros.h:376:43: note: in expansion of macro _G_BOOLEAN_EXPR
         #define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR((expr)), 1))
        /usr/include/glib-2.0/glib/gtestutils.h:116:49: note: in expansion of macro G_LIKELY
                                                      if G_LIKELY (expr) ; else \
        ../libnm-core/tests/test-general.c:5911:2: note: in expansion of macro g_assert
          g_assert (!host == (port == -1));
      Fixes: 713e879d ('libnm: add NMSockAddrEndpoint API')
      (cherry picked from commit 1e8c0873)
    • Thomas Haller's avatar
      ifcfg-rh: fix compiler warning in read_routing_rules_parse() · aabba1e4
      Thomas Haller authored
          CC       src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo
        In file included from ../shared/nm-default.h:280:0,
                         from ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:21:
        ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c: In function read_routing_rules_parse:
        ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4309:27: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses]
           nm_assert (!key_is_ipv4 == NM_STR_HAS_PREFIX (key, "ROUTING_RULE6_"));
        ../shared/nm-utils/nm-macros-internal.h:1793:7: note: in definition of macro __NM_G_BOOLEAN_EXPR_IMPL
           if (expr) \
        /usr/include/glib-2.0/glib/gmacros.h:376:43: note: in expansion of macro _G_BOOLEAN_EXPR
         #define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR((expr)), 1))
        /usr/include/glib-2.0/glib/gtestutils.h:116:49: note: in expansion of macro G_LIKELY
                                                      if G_LIKELY (expr) ; else \
        ../shared/nm-utils/nm-macros-internal.h:973:40: note: in expansion of macro g_assert
         #define nm_assert(cond) G_STMT_START { g_assert (cond); } G_STMT_END
        ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4309:3: note: in expansion of macro nm_assert
           nm_assert (!key_is_ipv4 == NM_STR_HAS_PREFIX (key, "ROUTING_RULE6_"));
      Fixes: 4d468044
      (cherry picked from commit c6e6dcae)
  2. 17 Apr, 2019 4 commits