diff options
Diffstat (limited to 'src/nm-types.h')
| -rw-r--r-- | src/nm-types.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/nm-types.h b/src/nm-types.h index fae344f2..2f1ac2dc 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -1,19 +1,5 @@ -/* NetworkManager -- Network link manager - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * +// SPDX-License-Identifier: GPL-2.0+ +/* * Copyright (C) 2012 - 2018 Red Hat, Inc. */ @@ -218,11 +204,20 @@ typedef enum { NMP_OBJECT_TYPE_MAX = __NMP_OBJECT_TYPE_LAST - 1, } NMPObjectType; +/** + * NMIPConfigMergeFlags: + * @NM_IP_CONFIG_MERGE_DEFAULT: no flags set + * @NM_IP_CONFIG_MERGE_NO_ROUTES: don't merge routes + * @NM_IP_CONFIG_MERGE_NO_DEFAULT_ROUTES: don't merge default routes + * @NM_IP_CONFIG_MERGE_NO_DNS: don't merge DNS information + * @NM_IP_CONFIG_MERGE_EXTERNAL: mark new addresses as external + */ typedef enum { NM_IP_CONFIG_MERGE_DEFAULT = 0, NM_IP_CONFIG_MERGE_NO_ROUTES = (1LL << 0), NM_IP_CONFIG_MERGE_NO_DEFAULT_ROUTES = (1LL << 1), NM_IP_CONFIG_MERGE_NO_DNS = (1LL << 2), + NM_IP_CONFIG_MERGE_EXTERNAL = (1LL << 3), } NMIPConfigMergeFlags; /** |