1. 16 Aug, 2014 1 commit
    • Dan Winship's avatar
      all: fix up multiple-include-guard defines · c81fb49a
      Dan Winship authored
      Previously, src/nm-ip4-config.h, libnm/nm-ip4-config.h, and
      libnm-glib/nm-ip4-config.h all used "NM_IP4_CONFIG_H" as an include
      guard, which meant that nm-test-utils.h could not tell which of them
      was being included (and so, eg, if you tried to include
      nm-ip4-config.h in a libnm test, it would fail to compile because
      nm-test-utils.h was referring to symbols in src/nm-ip4-config.h).
      
      Fix this by changing the include guards in the non-API-stable parts of
      the tree:
      
        - libnm-glib/nm-ip4-config.h remains   NM_IP4_CONFIG_H
        - libnm/nm-ip4-config.h now uses     __NM_IP4_CONFIG_H__
        - src/nm-ip4-config.h now uses       __NETWORKMANAGER_IP4_CONFIG_H__
      
      And likewise for all other headers.
      
      The two non-"nm"-prefixed headers, libnm/NetworkManager.h and
      src/NetworkManagerUtils.h are now __NETWORKMANAGER_H__ and
      __NETWORKMANAGER_UTILS_H__ respectively, which, while not entirely
      consistent with the general scheme, do still mostly make sense in
      isolation.
      c81fb49a
  2. 03 May, 2011 1 commit
    • Dan Williams's avatar
      dispatcher: enhance dispatcher script environment (bgo #648382) · f898dbf1
      Dan Williams authored
      For VPN connections, the interface name would be that of the VPN's
      IP interface, but the script environment would be the that of the
      VPN's parent device.  Enhance the environment by adding any VPN
      specific details as additional environment variables prefixed by
      "VPN_".  Leave the existing environment setup intact for backwards
      compatiblity.
      
      Additionally, the dispatcher never got updated for IPv6 support,
      so push IPv6 configuration and DHCPv6 configuration into the
      environment too.
      
      Even better, push everything the dispatcher needs to it instead
      of making the dispatcher make D-Bus requests back to NM, which
      sometimes fails if NM has already torn down the device or the
      connection which the device was using.
      
      And add some testcases to ensure that we don't break backwards compat,
      the testcases here were grabbed from a 0.8.4 machine with a hacked up
      dispatcher to dump everything it was given from NM.
      f898dbf1