wifi: Move the wifi helper function to service.c and remove wifi.c.

diff --git a/Makefile.am b/Makefile.am
index ed9e5a1..9c08453 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ include_HEADERS = include/types.h include/log.h include/plugin.h \
 
 nodist_include_HEADERS = include/version.h
 
-noinst_HEADERS = include/rtnl.h include/wifi.h include/task.h \
+noinst_HEADERS = include/rtnl.h include/task.h \
                        include/dbus.h include/rfkill.h include/option.h \
                        include/profile.h include/provider.h \
                        include/utsname.h include/timeserver.h include/proxy.h \
@@ -77,7 +77,7 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
                        src/resolver.c src/ipconfig.c src/detect.c src/inet.c \
                        src/dhcp.c src/rtnl.c src/proxy.c \
                        src/utsname.c src/timeserver.c src/rfkill.c \
-                       src/wifi.c src/storage.c src/dbus.c src/config.c \
+                       src/storage.c src/dbus.c src/config.c \
                        src/technology.c src/counter.c src/location.c \
                        src/session.c src/tethering.c src/wpad.c src/wispr.c \
                        src/stats.c src/iptables.c src/dnsproxy.c src/6to4.c

diff --git a/include/wifi.h b/include/wifi.h
deleted file mode 100644 (file)
index c90e312..0000000
--- a/include/wifi.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- *  Connection Manager
- *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  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 St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef __CONNMAN_WIFI_H
-#define __CONNMAN_WIFI_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-char *connman_wifi_build_group_name(const unsigned char *ssid,
-                                               unsigned int ssid_len,
-                                                       const char *mode,
-                                                       const char *security);
-
-char **connman_wifi_load_ssid(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __CONNMAN_WIFI_H */

diff --git a/src/connman.h b/src/connman.h
index 9cda193..e4f610e 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -133,8 +133,6 @@ typedef void (*__connman_inet_rs_cb_t) (struct nd_router_advert *reply,
 int __connman_inet_ipv6_send_rs(int index, int timeout,
                        __connman_inet_rs_cb_t callback, void *user_data);
 
-#include <connman/wifi.h>
-
 #include <connman/rfkill.h>
 
 int __connman_rfkill_init(void);

diff --git a/src/service.c b/src/service.c
index e46a020..24b466e 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1479,6 +1479,28 @@ static void stats_update(struct connman_service *service,
        stats->data.time = stats->data_last.time + seconds;
 }
 
+static char *wifi_build_group_name(const unsigned char *ssid,
+                                               unsigned int ssid_len,
+                                                       const char *mode,
+                                                       const char *security)
+{
+       GString *str;
+       unsigned int i;
+
+       /* the last 3 is for the 2 '_' and '\0' */
+       str = g_string_sized_new((ssid_len * 2) + strlen(mode)
+                                       + strlen(security) + 3);
+       if (str == NULL)
+               return NULL;
+
+       for (i = 0; i < ssid_len; i++)
+               g_string_append_printf(str, "%02x", ssid[i]);
+
+       g_string_append_printf(str, "_%s_%s", mode, security);
+
+       return g_string_free(str, FALSE);
+}
+
 void __connman_service_notify(struct connman_service *service,
                        unsigned int rx_packets, unsigned int tx_packets,
                        unsigned int rx_bytes, unsigned int tx_bytes,
@@ -4253,7 +4275,7 @@ int __connman_service_create_and_connect(DBusMessage *msg)
        else
                group_security = security;
 
-       group = connman_wifi_build_group_name((unsigned char *) ssid,
+       group = wifi_build_group_name((unsigned char *) ssid,
                                                ssid_len, mode, group_security);
        if (group == NULL)
                return -EINVAL;

diff --git a/src/wifi.c b/src/wifi.c
deleted file mode 100644 (file)
index 3bc9050..0000000
--- a/src/wifi.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *
- *  Connection Manager
- *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  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 St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-
-#include <glib.h>
-
-#include "connman.h"
-
-char *connman_wifi_build_group_name(const unsigned char *ssid,
-                                               unsigned int ssid_len,
-                                                       const char *mode,
-                                                       const char *security)
-{
-       GString *str;
-       unsigned int i;
-
-       str = g_string_sized_new((ssid_len * 2) + 24);
-       if (str == NULL)
-               return NULL;
-
-       if (ssid_len > 0 && ssid[0] != '\0') {
-               for (i = 0; i < ssid_len; i++)
-                       g_string_append_printf(str, "%02x", ssid[i]);
-       }
-
-       g_string_append_printf(str, "_%s_%s", mode, security);
-
-       return g_string_free(str, FALSE);
-}
-
-char **connman_wifi_load_ssid(void)
-{
-       GKeyFile *key_file;
-       const char * profile;
-       gchar **groups, *group;
-       gsize num_groups;
-       char **hex_ssids;
-       int i, j;
-
-       profile = __connman_profile_active_ident();
-
-       key_file = __connman_storage_open_profile(profile);
-       if (key_file == NULL)
-               return NULL;
-
-       groups = g_key_file_get_groups(key_file, &num_groups);
-
-       hex_ssids = g_try_malloc0(sizeof(*hex_ssids) * (num_groups + 1));
-       if (hex_ssids == NULL)
-               goto done;
-
-       for (i = 0, j = 0; groups[i]; i++) {
-               gchar *hex_ssid;
-               gboolean favorite;
-
-               group = groups[i];
-
-               favorite = g_key_file_get_boolean(key_file, group,
-                                                       "Favorite", NULL);
-               if (favorite == FALSE)
-                       continue;
-
-               hex_ssid = g_key_file_get_string(key_file, group,
-                                                       "SSID", NULL);
-               if (hex_ssid == NULL)
-                       continue;
-
-               hex_ssids[j++] = hex_ssid;
-       }
-
-       hex_ssids[j] = NULL;
-
-done:
-       g_strfreev(groups);
-
-       __connman_storage_close_profile(profile, key_file, FALSE);
-
-       return hex_ssids;
-}