d595f7843e
This commit begins creating the new "libnm", which will replace libnm-util and libnm-glib. The main reason for the libnm-util/libnm-glib split is that the daemon needs to link to libnm-util (to get NMSettings, NMConnection, etc), but can't link to libnm-glib (because it uses many of the same type names as the NetworkManager daemon. eg, NMDevice). So the daemon links to only libnm-util, but basically all clients link to both. With libnm, there will be only a single client-visible library, and NetworkManager will internally link against a private "libnm-core" containing the parts that used to be in libnm-util. (The "libnm-core" parts still need to be in their own directory so that the daemon can see those header files without also seeing the ones in libnm/ that conflict with its own headers.) [This commit just copies the source code from libnm-util/ to libnm-core/, and libnm-glib/ to libnm/: mkdir -p libnm-core/tests/ mkdir -p libnm/tests/ cp libnm-util/*.[ch] libnm-util/nm-version.h.in libnm-core/ rm -f libnm-core/nm-version.h libnm-core/nm-setting-template.[ch] libnm-core/nm-utils-enum-types.[ch] cp libnm-util/tests/*.[ch] libnm-core/tests/ cp libnm-glib/*.[ch] libnm/ rm -f libnm/libnm_glib.[ch] libnm/libnm-glib-test.c libnm/nm-glib-enum-types.[ch] cp libnm-glib/tests/*.[ch] libnm/tests/ ]
66 lines
2.5 KiB
C
66 lines
2.5 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright 2005 - 2008 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NM_UTILS_PRIVATE_H__
|
|
#define __NM_UTILS_PRIVATE_H__
|
|
|
|
#include "nm-setting-private.h"
|
|
|
|
gboolean _nm_utils_string_in_list (const char *str,
|
|
const char **valid_strings);
|
|
|
|
gboolean _nm_utils_string_slist_validate (GSList *list,
|
|
const char **valid_values);
|
|
|
|
gboolean _nm_utils_gvalue_array_validate (GValueArray *elements,
|
|
guint n_expected, ...);
|
|
|
|
void _nm_value_transforms_register (void);
|
|
|
|
/***********************************************************/
|
|
|
|
typedef struct NMUtilsPrivateData {
|
|
const char * (*nm_setting_ip4_config_get_address_label) (NMSettingIP4Config *setting,
|
|
guint32 i);
|
|
gboolean (*nm_setting_ip4_config_add_address_with_label) (NMSettingIP4Config *setting,
|
|
NMIP4Address *address,
|
|
const char *label);
|
|
} NMUtilsPrivateData;
|
|
|
|
const NMUtilsPrivateData *nm_utils_get_private (void);
|
|
|
|
/**
|
|
* NM_UTILS_PRIVATE_CALL:
|
|
* @call: a call to a private libnm-util function
|
|
*
|
|
* Used to call private libnm-util functions. Eg, if there was a
|
|
* private function called nm_foo_get_bar(), you could call it like:
|
|
*
|
|
* bar = NM_UTILS_PRIVATE_CALL (nm_foo_get_bar (foo, x, y, z));
|
|
*
|
|
* This macro only exists inside the NetworkManager source tree and
|
|
* is not part of the public API.
|
|
*
|
|
* Since: 0.9.10
|
|
*/
|
|
#define NM_UTILS_PRIVATE_CALL(call) (nm_utils_get_private ()->call)
|
|
|
|
#endif
|