mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-25 09:30:16 +01:00
24adbe3fa4
* src/NetworkManagerUtils.c
(nm_utils_is_empty_ssid):
(nm_utils_escape_ssid):
(nm_utils_same_ssid): Remove. These functions are copied and
pasted in a
lot of places, so they belong to libnm-utils instead.
Now with 100% less compiler warnings:
* libnm-util/nm-utils.c (nm_dbus_escape_object_path): Remove,
* unused.
(nm_dbus_unescape_object_path): Ditto.
(nm_utils_ssid_to_utf8): Ditto.
(nm_utils_is_empty_ssid): Move here from
src/NetworkManagerUtils.c
(nm_utils_escape_ssid): Ditto.
(nm_utils_same_ssid): Ditto.
* src/nm-manager.c: Include 'netinet/ether.h' for ether_aton_r.
(add_one_connection_element): Remove an unused variable.
(impl_manager_get_active_connections): Ditto.
* src/NetworkManagerPolicy.c (get_device_connection): Remove an
* unused
variable.
* src/nm-dbus-manager.c (nm_dbus_manager_start_service): Remove
* a leftover
from the previous commit.
* src/nm-device-802-11-wireless.c (set_current_ap): Remove
* unused variable.
(real_act_stage1_prepare): Ditto.
(activation_success_handler): Ditto.
(get_property): Ditto.
* src/nm-device-802-3-ethernet.c (real_get_best_connection):
* Remove unused
variable.
* src/ppp-manager/nm-pppd-plugin.c (nm_ip_up): Remove the check
* for 'ifname',
it's always set.
* src/supplicant-manager/nm-supplicant-config.c
(nm_supplicant_config_add_setting_wireless): Cast the
GByteArray's 'guint8 *'
to expected "char *".
(nm_supplicant_config_add_setting_wireless): Ditto.
(nm_supplicant_config_remove_option): Remove, not used.
* libnm-glib/libnm-glib-test.c (dump_access_point): Frequency is
* a guint32,
not double.
(test_wireless_enabled): Ifdef out unused function.
(device_deactivate): Ditto.
(device_state_changed): Ditto.
(nm_utils_is_empty_ssid): Remove, it's now in libnm-utils.
(nm_utils_escape_ssid): Ditto.
* test/nm-tool.c (nm_utils_escape_ssid): Remove, it's now in
* libnm-utils.
(nm_utils_is_empty_ssid): Ditto.
* libnm-glib/nm-client.c
* (nm_client_free_active_connection_element): Remove
unused variable.
* libnm-util/nm-setting.c (setting_wireless_destroy): Remove
* unused variable.
(setting_vpn_properties_update_secrets): Ditto.
(int_to_gvalue): Ifdef out for now, not used.
(byte_to_gvalue): Ditto.
* libnm-util/dbus-dict-helpers.c
* (_nmu_dbus_add_dict_entry_string_array):
Unused, remove.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2960 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
111 lines
3.2 KiB
C
111 lines
3.2 KiB
C
/* NetworkManager -- Network link manager
|
|
*
|
|
* Dan Williams <dcbw@redhat.com>
|
|
*
|
|
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* (C) Copyright 2004 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef NETWORK_MANAGER_UTILS_H
|
|
#define NETWORK_MANAGER_UTILS_H
|
|
|
|
#include <glib.h>
|
|
#include <stdio.h>
|
|
#include <syslog.h>
|
|
#include <net/ethernet.h>
|
|
#include <iwlib.h>
|
|
#include <sys/time.h>
|
|
#include <stdarg.h>
|
|
|
|
#include "NetworkManager.h"
|
|
#include "nm-device.h"
|
|
|
|
typedef enum SockType
|
|
{
|
|
DEV_WIRELESS,
|
|
DEV_GENERAL,
|
|
NETWORK_CONTROL
|
|
} SockType;
|
|
|
|
typedef struct NMSock NMSock;
|
|
|
|
|
|
NMSock * nm_dev_sock_open (const char *iface,
|
|
SockType type,
|
|
const char *func_name,
|
|
const char *desc);
|
|
|
|
void nm_dev_sock_close (NMSock *sock);
|
|
int nm_dev_sock_get_fd (NMSock *sock);
|
|
void nm_print_open_socks (void);
|
|
|
|
int nm_null_safe_strcmp (const char *s1, const char *s2);
|
|
|
|
gboolean nm_ethernet_address_is_valid (const struct ether_addr *test_addr);
|
|
gboolean nm_ethernet_addresses_are_equal (const struct ether_addr *a, const struct ether_addr *b);
|
|
|
|
int nm_spawn_process (const char *args);
|
|
|
|
void nm_print_device_capabilities (NMDevice *dev);
|
|
|
|
#define NM_COMPLETION_TRIES_INFINITY -1
|
|
|
|
typedef void * nm_completion_args[8];
|
|
|
|
typedef gboolean (*nm_completion_func)(int tries, nm_completion_args args);
|
|
typedef gboolean (*nm_completion_boolean_function_1)(u_int64_t arg);
|
|
typedef gboolean (*nm_completion_boolean_function_2)(
|
|
u_int64_t arg0, u_int64_t arg1);
|
|
|
|
void nm_wait_for_completion(
|
|
const int max_tries,
|
|
const guint interval_usecs,
|
|
nm_completion_func test_func,
|
|
nm_completion_func action_func,
|
|
nm_completion_args args);
|
|
|
|
void nm_wait_for_completion_or_timeout(
|
|
const int max_tries,
|
|
const struct timeval *max_time,
|
|
const guint interval_usecs,
|
|
nm_completion_func test_func,
|
|
nm_completion_func action_func,
|
|
nm_completion_args args);
|
|
|
|
void nm_wait_for_timeout(
|
|
const struct timeval *max_time,
|
|
const guint interval_usecs,
|
|
nm_completion_func test_func,
|
|
nm_completion_func action_func,
|
|
nm_completion_args args);
|
|
|
|
gboolean nm_completion_boolean_test(int tries, nm_completion_args args);
|
|
gboolean nm_completion_boolean_function1_test(int tries,
|
|
nm_completion_args args);
|
|
gboolean nm_completion_boolean_function2_test(int tries,
|
|
nm_completion_args args);
|
|
#define nm_completion_boolean_function_test nm_completion_boolean_function1_test
|
|
|
|
gchar* nm_utils_inet_ip4_address_as_string (guint32 ip);
|
|
|
|
struct nl_addr * nm_utils_ip4_addr_to_nl_addr (guint32 ip4_addr);
|
|
|
|
int nm_utils_ip4_netmask_to_prefix (guint32 ip4_netmask);
|
|
|
|
char * nm_utils_hexstr2bin (const char *hex, size_t len);
|
|
|
|
#endif
|
|
|