about summary refs log tree commit diff
path: root/clients/cli/common.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-06-04 00:08:31 +0200
committerMichael Biebl <biebl@debian.org>2018-06-04 00:08:31 +0200
commit0dd9df69fdbd475c48a0c8d5b0a1882550fe7321 (patch)
tree249cf25643b1fe408e10679bb61613bc6540e894 /clients/cli/common.h
parent2e94a3b93171ab3fb95bf689aab1664d23988809 (diff)
parent04bc9e1cd3544445d883ad29ea108c1645c8e7b7 (diff)
Update upstream source from tag 'upstream/1.11.4'
Update to upstream version '1.11.4'
with Debian dir d0638aa2e32d5bae4e8daa021b9a66b7c4d6647e
Diffstat (limited to 'clients/cli/common.h')
-rw-r--r--clients/cli/common.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/clients/cli/common.h b/clients/cli/common.h
index 354b2a5f..8f4e47c2 100644
--- a/clients/cli/common.h
+++ b/clients/cli/common.h
@@ -27,15 +27,20 @@
 
 gboolean print_ip4_config (NMIPConfig *cfg4, const NmcConfig *nmc_config, const char *one_field);
 gboolean print_ip6_config (NMIPConfig *cfg6, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field);
-gboolean print_dhcp4_config (NMDhcpConfig *dhcp4, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field);
-gboolean print_dhcp6_config (NMDhcpConfig *dhcp6, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field);
+gboolean print_dhcp_config (NMDhcpConfig *dhcp, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field);
 
 NMConnection *nmc_find_connection (const GPtrArray *connections,
                                    const char *filter_type,
                                    const char *filter_val,
-                                   int *start,
+                                   GPtrArray **out_result,
                                    gboolean complete);
 
+NMActiveConnection *nmc_find_active_connection (const GPtrArray *active_cons,
+                                                const char *filter_type,
+                                                const char *filter_val,
+                                                GPtrArray **out_result,
+                                                gboolean complete);
+
 void nmc_secrets_requested (NMSecretAgentSimple *agent,
                             const char          *request_id,
                             const char          *title,
@@ -78,8 +83,7 @@ void nmc_complete_bool (const char *prefix);
 const char *nmc_error_get_simple_message (GError *error);
 
 extern const NmcMetaGenericInfo *const metagen_ip4_config[];
-extern const NmcMetaGenericInfo *const nmc_fields_dhcp4_config[];
 extern const NmcMetaGenericInfo *const nmc_fields_ip6_config[];
-extern const NmcMetaGenericInfo *const nmc_fields_dhcp6_config[];
+extern const NmcMetaGenericInfo *const nmc_fields_dhcp_config[];
 
 #endif /* NMC_COMMON_H */