Attachment 117858 Details for Bug 90974 – Add GClueNMEASource

[patch] Add GClueNMEASource

Add-GClueNMEASource.patch (text/plain), 28.40 KB, created by Zeeshan Ali on 2015-08-22 13:25:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zeeshan Ali

Created: 2015-08-22 13:25:04 UTC

Size: 28.40 KB

patch

obsolete

>From fe88a417e35bc27d0bd80a78a426eb66af0349ff Mon Sep 17 00:00:00 2001
>From: Ankit <ankitstarski@gmail.com>
>Date: Wed, 15 Jul 2015 20:42:03 +0530
>Subject: [PATCH] Add GClueNMEASource
>
>GClueNMEASource receives NMEA GGA sentences from a NMEA source on the
>network. It uses Avahi for the auto-discovery of nmea-tcp services on
>local network.
>
>This will enable us to receive location info from other devices on the
>local network with location capabilities, such as smartphones.
>
>This patch add dependency on avahi-glib and avahi-client.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=90974
>---
> configure.ac            |  22 ++
> src/Makefile.am         |   6 +
> src/gclue-locator.c     |  11 +
> src/gclue-nmea-source.c | 656 ++++++++++++++++++++++++++++++++++++++++++++++++
> src/gclue-nmea-source.h |  71 ++++++
> 5 files changed, 766 insertions(+)
> create mode 100644 src/gclue-nmea-source.c
> create mode 100644 src/gclue-nmea-source.h
>
>diff --git a/configure.ac b/configure.ac
>index 4d42bf3..e39da8b 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -41,6 +41,7 @@ GLIB_MIN_VERSION=2.34.0
> JSON_GLIB_MIN_VERSION=0.14
> LIBMM_GLIB_MIN_VERSION=1.0
> LIBSOUP_MIN_VERSION=2.42
>+AVAHI_MIN_VERSION=0.6.10
> 
> AC_CHECK_LIB([m],[sin])
> 
>@@ -104,6 +105,26 @@ if test "x$require_modemmanager" = "xyes"; then
>   PKG_CHECK_MODULES(ModemManager, mm-glib >= $LIBMM_GLIB_MIN_VERSION)
> fi
> 
>+# Network NMEA Source
>+AC_ARG_ENABLE(nmea-source,
>+              AS_HELP_STRING([--disable-nmea-source],
>+                             [Disable network NMEA source (requires avahi-client and avahi-glib)]),
>+              [build_nmea_source=$enableval], [build_nmea_source=yes])
>+
>+if test "x$build_nmea_source" = "xyes"; then
>+  AC_DEFINE([GCLUE_USE_NMEA_SOURCE], [1], [Build network NMEA source?])
>+else
>+  AC_DEFINE([GCLUE_USE_NMEA_SOURCE], [0], [Build network NMEA source?])
>+fi
>+AM_CONDITIONAL([BUILD_NMEA_SOURCE], [test "x$build_nmea_source" = "xyes"])
>+
>+if test "x$build_nmea_source" = "xyes"; then
>+    # Check for avahi-client and avahi-glib
>+    PKG_CHECK_MODULES(NMEA_SOURCE, [
>+                      avahi-client >= $AVAHI_MIN_VERSION
>+                      avahi-glib >= $AVAHI_MIN_VERSION])
>+fi
>+
> # Demo agent
> AC_ARG_ENABLE(demo-agent,
>               AS_HELP_STRING([--enable-demo-agent=yes|no],
>@@ -208,4 +229,5 @@ AC_MSG_NOTICE([
>         3G source:                ${build_3g_source}
>         CDMA source:              ${build_cdma_source}
>         Modem GPS source:         ${build_modem_gps_source}
>+        Network NMEA source:      ${build_nmea_source}
> ])
>diff --git a/src/Makefile.am b/src/Makefile.am
>index b3f22dc..3de59b3 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -66,6 +66,7 @@ noinst_LTLIBRARIES = libgeoclue.la
> 
> AM_CPPFLAGS = $(GEOCLUE_CFLAGS) 		     	  \
> 	      $(ModemManager_CFLAGS)			  \
>+	      $(NMEA_SOURCE_CFLAGS)			  \
> 	      $(WARN_CFLAGS)			     	  \
> 	      -DLOCALEDIR="\"$(datadir)/locale\"" 	  \
> 	      -DG_LOG_DOMAIN=\""Geoclue"\"	     	  \
>@@ -126,9 +127,14 @@ if BUILD_MODEM_GPS_SOURCE
> libgeoclue_la_SOURCES += gclue-modem-gps.c gclue-modem-gps.h
> endif
> 
>+if BUILD_NMEA_SOURCE
>+libgeoclue_la_SOURCES += gclue-nmea-source.h gclue-nmea-source.c
>+endif
>+
> libgeoclue_la_LIBADD = \
> 	$(GEOCLUE_LIBS)			\
> 	$(ModemManager_LIBS)		\
>+	$(NMEA_SOURCE_LIBS)		\
> 	$(LIBS)				\
> 	$(NULL)
> 
>diff --git a/src/gclue-locator.c b/src/gclue-locator.c
>index a062eff..5280686 100644
>--- a/src/gclue-locator.c
>+++ b/src/gclue-locator.c
>@@ -41,6 +41,10 @@
> #include "gclue-modem-gps.h"
> #endif
> 
>+#if GCLUE_USE_NMEA_SOURCE
>+#include "gclue-nmea-source.h"
>+#endif
>+
> /* This class is like a master location source that hides all individual
>  * location sources from rest of the code
>  */
>@@ -298,6 +302,13 @@ gclue_locator_constructed (GObject *object)
>         locator->priv->sources = g_list_append (locator->priv->sources, gps);
>         submit_source = GCLUE_LOCATION_SOURCE (gps);
> #endif
>+#if GCLUE_USE_NMEA_SOURCE
>+        {
>+                GClueNMEASource *nmea = gclue_nmea_source_get_singleton ();
>+                locator->priv->sources = g_list_append (locator->priv->sources,
>+                                                        nmea);
>+        }
>+#endif
> 
>         for (node = locator->priv->sources; node != NULL; node = node->next) {
>                 g_signal_connect (G_OBJECT (node->data),
>diff --git a/src/gclue-nmea-source.c b/src/gclue-nmea-source.c
>new file mode 100644
>index 0000000..fdfb98f
>--- /dev/null
>+++ b/src/gclue-nmea-source.c
>@@ -0,0 +1,656 @@
>+/* vim: set et ts=8 sw=8: */
>+/*
>+ * Copyright (C) 2014 Red Hat, Inc.
>+ * Copyright (C) 2015 Ankit (Verma)
>+ *
>+ * Geoclue 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.
>+ *
>+ * Geoclue 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 Geoclue; if not, write to the Free Software Foundation, Inc.,
>+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>+ *
>+ * Authors: Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
>+ *          Ankit (Verma) <ankitstarski@gmail.com>
>+ */
>+
>+#include <stdlib.h>
>+#include <glib.h>
>+#include "gclue-nmea-source.h"
>+#include "gclue-location.h"
>+#include "config.h"
>+#include "public-api/gclue-enum-types.h"
>+
>+#include <avahi-client/lookup.h>
>+#include <avahi-common/simple-watch.h>
>+#include <avahi-common/malloc.h>
>+#include <avahi-common/error.h>
>+#include <avahi-glib/glib-watch.h>
>+
>+typedef struct AvahiServiceInfo AvahiServiceInfo;
>+
>+struct _GClueNMEASourcePrivate {
>+        GSocketConnection *connection;
>+
>+        GSocketClient *client;
>+
>+        GCancellable *cancellable;
>+
>+        AvahiClient *avahi_client;
>+
>+        AvahiServiceInfo *active_service;
>+
>+        /* List of all services but only the most accurate one is used. */
>+        GList *all_services;
>+};
>+
>+G_DEFINE_TYPE (GClueNMEASource, gclue_nmea_source, GCLUE_TYPE_LOCATION_SOURCE)
>+
>+static gboolean
>+gclue_nmea_source_start (GClueLocationSource *source);
>+static gboolean
>+gclue_nmea_source_stop (GClueLocationSource *source);
>+
>+struct AvahiServiceInfo {
>+    char *identifier;
>+    char *host_name;
>+    guint16 port;
>+    GClueAccuracyLevel accuracy;
>+};
>+
>+static void
>+avahi_service_free (gpointer data)
>+{
>+        AvahiServiceInfo *service = (AvahiServiceInfo *) data;
>+
>+        g_free (service->identifier);
>+        g_free (service->host_name);
>+        g_slice_free(AvahiServiceInfo, service);
>+}
>+
>+static AvahiServiceInfo *
>+avahi_service_new (const char        *identifier,
>+                   const char        *host_name,
>+                   guint16            port,
>+                   GClueAccuracyLevel accuracy)
>+{
>+        AvahiServiceInfo *service = g_slice_new0 (AvahiServiceInfo);
>+
>+        service->identifier = g_strdup (identifier);
>+        service->host_name = g_strdup (host_name);
>+        service->port = port;
>+        service->accuracy = accuracy;
>+
>+        return service;
>+}
>+
>+static gint
>+compare_avahi_service_by_identifier (gconstpointer a,
>+                                     gconstpointer b)
>+{
>+        AvahiServiceInfo *first, *second;
>+
>+        first = (AvahiServiceInfo *) a;
>+        second = (AvahiServiceInfo *) b;
>+
>+        return g_strcmp0 (first->identifier, second->identifier);
>+}
>+
>+static gint
>+compare_avahi_service_by_accuracy (gconstpointer a,
>+                                   gconstpointer b)
>+{
>+        AvahiServiceInfo *first, *second;
>+        gint diff;
>+
>+        first = (AvahiServiceInfo *) a;
>+        second = (AvahiServiceInfo *) b;
>+
>+        diff = second->accuracy - first->accuracy;
>+
>+        if (diff == 0)
>+                return 0;
>+
>+        return diff > 0 ? 1 : -1;
>+}
>+
>+static void
>+refresh_accuracy_level (GClueNMEASource *source)
>+{
>+        GClueAccuracyLevel new, existing;
>+
>+        existing = gclue_location_source_get_available_accuracy_level
>+                        (GCLUE_LOCATION_SOURCE (source));
>+
>+        if (source->priv->all_services != NULL) {
>+                AvahiServiceInfo *service;
>+
>+                service = (AvahiServiceInfo *) source->priv->all_services->data;
>+                new = service->accuracy;
>+        } else {
>+                new = GCLUE_ACCURACY_LEVEL_NONE;
>+        }
>+
>+        if (new != existing) {
>+                g_debug ("Available accuracy level from %s: %u",
>+                         G_OBJECT_TYPE_NAME (source), new);
>+                g_object_set (G_OBJECT (source),
>+                              "available-accuracy-level", new,
>+                              NULL);
>+        }
>+}
>+
>+static void
>+add_new_service (const char *name,
>+                 const char *host_name,
>+                 uint16_t port,
>+                 AvahiStringList *txt,
>+                 GClueNMEASource *source)
>+{
>+        GClueAccuracyLevel accuracy = GCLUE_ACCURACY_LEVEL_NONE;
>+        AvahiServiceInfo *service;
>+        AvahiStringList *node;
>+        guint n_services;
>+        char *key, *value;
>+        GEnumClass *enum_class;
>+        GEnumValue *enum_value;
>+
>+
>+        node = avahi_string_list_find (txt, "accuracy");
>+
>+        if (node == NULL) {
>+                g_warning ("No `accuracy` key inside TXT record");
>+                accuracy = GCLUE_ACCURACY_LEVEL_EXACT;
>+
>+                goto CREATE_SERVICE;
>+        }
>+
>+        avahi_string_list_get_pair (node, &key, &value, NULL);
>+
>+        if (value == NULL) {
>+                g_warning ("There is no value for `accuracy` inside TXT "
>+                           "record");
>+                accuracy = GCLUE_ACCURACY_LEVEL_EXACT;
>+
>+                goto CREATE_SERVICE;
>+        }
>+
>+        enum_class = g_type_class_ref (GCLUE_TYPE_ACCURACY_LEVEL);
>+        enum_value = g_enum_get_value_by_nick (enum_class, value);
>+        g_type_class_unref (enum_class);
>+
>+        if (enum_value == NULL) {
>+                g_warning ("Invalid `accuracy` value inside TXT records.");
>+                accuracy = GCLUE_ACCURACY_LEVEL_EXACT;
>+
>+                goto CREATE_SERVICE;
>+        }
>+
>+        accuracy = enum_value->value;
>+
>+CREATE_SERVICE:
>+        service = avahi_service_new (name, host_name, port, accuracy);
>+
>+        source->priv->all_services = g_list_insert_sorted
>+                (source->priv->all_services,
>+                 service,
>+                 compare_avahi_service_by_accuracy);
>+
>+        /* FIXME: If a new service with better accuracy comes in,
>+         *        connect to it (if source is running).
>+         */
>+        refresh_accuracy_level (source);
>+
>+        n_services = g_list_length (source->priv->all_services);
>+
>+        g_debug ("No. of _nmea-0183._tcp services %u", n_services);
>+}
>+
>+static void
>+remove_service (const char      *name,
>+                GClueNMEASource *source)
>+{
>+        AvahiServiceInfo *service;
>+        guint n_services = 0;
>+        GList *item;
>+
>+        /* only `name` is required here */
>+        service = avahi_service_new (name,
>+                                     NULL,
>+                                     0,
>+                                     GCLUE_ACCURACY_LEVEL_NONE);
>+
>+        item = g_list_find_custom (source->priv->all_services,
>+                                   service,
>+                                   compare_avahi_service_by_identifier);
>+
>+        source->priv->all_services = g_list_delete_link
>+                (source->priv->all_services, item);
>+
>+        n_services = g_list_length (source->priv->all_services);
>+
>+        g_debug ("No. of _nmea-0183._tcp services %u",
>+                 n_services);
>+
>+        avahi_service_free (service);
>+
>+        refresh_accuracy_level (source);
>+}
>+
>+static void
>+resolve_callback (AvahiServiceResolver  *service_resolver,
>+                  AvahiIfIndex           interface G_GNUC_UNUSED,
>+                  AvahiProtocol          protocol G_GNUC_UNUSED,
>+                  AvahiResolverEvent     event,
>+                  const char            *name,
>+                  const char            *type,
>+                  const char            *domain,
>+                  const char            *host_name,
>+                  const AvahiAddress    *address,
>+                  uint16_t               port,
>+                  AvahiStringList       *txt,
>+                  AvahiLookupResultFlags flags,
>+                  void                  *user_data)
>+{
>+        const char *errorstr;
>+
>+        /* FIXME: check with Avahi devs whether this is really needed. */
>+        g_return_if_fail (service_resolver != NULL);
>+
>+        switch (event) {
>+        case AVAHI_RESOLVER_FAILURE: {
>+                AvahiClient *avahi_client = avahi_service_resolver_get_client
>+                        (service_resolver);
>+
>+                errorstr = avahi_strerror (avahi_client_errno (avahi_client));
>+
>+                g_warning ("(Resolver) Failed to resolve service '%s' "
>+                           "of type '%s' in domain '%s': %s",
>+                           name,
>+                           type,
>+                           domain,
>+                           errorstr);
>+
>+                break;
>+        }
>+
>+        case AVAHI_RESOLVER_FOUND:
>+                g_debug ("Service %s:%u resolved",
>+                         host_name,
>+                         port);
>+
>+                add_new_service (name,
>+                                 host_name,
>+                                 port,
>+                                 txt,
>+                                 GCLUE_NMEA_SOURCE (user_data));
>+
>+                break;
>+        }
>+
>+    avahi_service_resolver_free (service_resolver);
>+}
>+
>+static void
>+client_callback (AvahiClient     *avahi_client,
>+                 AvahiClientState state,
>+                 void            *user_data)
>+{
>+        GClueNMEASourcePrivate *priv = GCLUE_NMEA_SOURCE (user_data)->priv;
>+
>+        g_return_if_fail (avahi_client != NULL);
>+
>+        if (state == AVAHI_CLIENT_FAILURE) {
>+                const char *errorstr = avahi_strerror
>+                        (avahi_client_errno (priv->avahi_client));
>+                g_warning ("Avahi client failure: %s",
>+                           errorstr);
>+        }
>+}
>+
>+static void
>+browse_callback (AvahiServiceBrowser   *service_browser,
>+                 AvahiIfIndex           interface,
>+                 AvahiProtocol          protocol,
>+                 AvahiBrowserEvent      event,
>+                 const char            *name,
>+                 const char            *type,
>+                 const char            *domain,
>+                 AvahiLookupResultFlags flags G_GNUC_UNUSED,
>+                 void                  *user_data)
>+{
>+        GClueNMEASourcePrivate *priv = GCLUE_NMEA_SOURCE (user_data)->priv;
>+        const char *errorstr;
>+
>+        /* FIXME: check with Avahi devs whether this is really needed. */
>+        g_return_if_fail (service_browser != NULL);
>+
>+        switch (event) {
>+        case AVAHI_BROWSER_FAILURE:
>+                errorstr = avahi_strerror (avahi_client_errno
>+                        (avahi_service_browser_get_client (service_browser)));
>+
>+                g_warning ("Avahi service browser Error %s", errorstr);
>+
>+                return;
>+
>+        case AVAHI_BROWSER_NEW: {
>+                AvahiServiceResolver *service_resolver;
>+
>+                g_debug ("Service '%s' of type '%s' found in domain '%s'",
>+                         name, type, domain);
>+
>+                service_resolver = avahi_service_resolver_new
>+                        (priv->avahi_client,
>+                         interface, protocol,
>+                         name, type,
>+                         domain,
>+                         AVAHI_PROTO_UNSPEC,
>+                         0,
>+                         resolve_callback,
>+                         user_data);
>+
>+                if (service_resolver == NULL) {
>+                        errorstr = avahi_strerror
>+                                (avahi_client_errno (priv->avahi_client));
>+
>+                        g_warning ("Failed to resolve service '%s': %s",
>+                                   name,
>+                                   errorstr);
>+                }
>+
>+                break;
>+        }
>+
>+        case AVAHI_BROWSER_REMOVE:
>+                g_debug ("Service '%s' of type '%s' in domain '%s' removed "
>+                         "from the list of available NMEA services",
>+                         name,
>+                         type,
>+                         domain);
>+
>+                remove_service (name, GCLUE_NMEA_SOURCE (user_data));
>+
>+                break;
>+
>+        case AVAHI_BROWSER_ALL_FOR_NOW:
>+        case AVAHI_BROWSER_CACHE_EXHAUSTED:
>+                g_debug ("Avahi Service Browser's %s event occurred",
>+                         event == AVAHI_BROWSER_CACHE_EXHAUSTED ?
>+                         "CACHE_EXHAUSTED" :
>+                         "ALL_FOR_NOW");
>+
>+                break;
>+        }
>+}
>+
>+static void
>+on_read_gga_sentence (GObject      *object,
>+                      GAsyncResult *result,
>+                      gpointer      user_data)
>+{
>+        GClueNMEASource *source = GCLUE_NMEA_SOURCE (user_data);
>+        GDataInputStream *data_input_stream = G_DATA_INPUT_STREAM (object);
>+        GError *error = NULL;
>+        GClueLocation *location;
>+        gsize data_size = 0 ;
>+        char *message;
>+
>+        message = g_data_input_stream_read_line_finish (data_input_stream,
>+                                                        result,
>+                                                        &data_size,
>+                                                        &error);
>+
>+        if (message == NULL) {
>+                g_warning ("Error when receiving message");
>+                if (error != NULL) {
>+                        g_warning ("%s", error->message);
>+                        g_clear_error (&error);
>+                }
>+
>+                return;
>+        }
>+        g_debug ("Network source sent: \"%s\"", message);
>+
>+        if (!g_str_has_prefix (message, "$GPGGA")) {
>+                /* FIXME: Handle other useful NMEA sentences too */
>+                g_debug ("Ignoring non-GGA sentence from NMEA source");
>+
>+                goto READ_NEXT_LINE;
>+        }
>+
>+        location = gclue_location_create_from_gga (message, &error);
>+
>+        if (error != NULL) {
>+                g_warning ("Error: %s", error->message);
>+                g_clear_error (&error);
>+        } else {
>+                gclue_location_source_set_location
>+                        (GCLUE_LOCATION_SOURCE (source), location);
>+        }
>+
>+READ_NEXT_LINE:
>+        g_data_input_stream_read_line_async (data_input_stream,
>+                                             G_PRIORITY_DEFAULT,
>+                                             source->priv->cancellable,
>+                                             on_read_gga_sentence,
>+                                             source);
>+}
>+
>+static void
>+on_connection_to_location_server (GObject      *object,
>+                                  GAsyncResult *result,
>+                                  gpointer      user_data)
>+{
>+        GClueNMEASource *source = GCLUE_NMEA_SOURCE (user_data);
>+        GSocketClient *client = G_SOCKET_CLIENT (object);
>+        GError *error = NULL;
>+        GDataInputStream *data_input_stream;
>+        GInputStream *input_stream;
>+
>+        source->priv->connection = g_socket_client_connect_to_host_finish
>+                (client,
>+                 result,
>+                 &error);
>+
>+        if (error != NULL) {
>+                g_warning ("%s", error->message);
>+                g_clear_error (&error);
>+
>+                return;
>+        }
>+
>+        input_stream = g_io_stream_get_input_stream
>+                (G_IO_STREAM (source->priv->connection));
>+        data_input_stream = g_data_input_stream_new (input_stream);
>+
>+        g_data_input_stream_read_line_async (data_input_stream,
>+                                             G_PRIORITY_DEFAULT,
>+                                             source->priv->cancellable,
>+                                             on_read_gga_sentence,
>+                                             source);
>+        g_object_unref (data_input_stream);
>+}
>+
>+static void
>+gclue_nmea_source_finalize (GObject *gnmea)
>+{
>+        GClueNMEASourcePrivate *priv = GCLUE_NMEA_SOURCE (gnmea)->priv;
>+
>+        G_OBJECT_CLASS (gclue_nmea_source_parent_class)->finalize (gnmea);
>+
>+        g_clear_object (&priv->connection);
>+        g_clear_object (&priv->client);
>+        g_clear_object (&priv->cancellable);
>+        avahi_client_free (priv->avahi_client);
>+        g_list_free_full (priv->all_services,
>+                          avahi_service_free);
>+}
>+
>+static void
>+gclue_nmea_source_class_init (GClueNMEASourceClass *klass)
>+{
>+        GClueLocationSourceClass *source_class = GCLUE_LOCATION_SOURCE_CLASS (klass);
>+        GObjectClass *gnmea_class = G_OBJECT_CLASS (klass);
>+
>+        gnmea_class->finalize = gclue_nmea_source_finalize;
>+
>+        source_class->start = gclue_nmea_source_start;
>+        source_class->stop = gclue_nmea_source_stop;
>+
>+        g_type_class_add_private (klass, sizeof (GClueNMEASourcePrivate));
>+}
>+
>+static void
>+gclue_nmea_source_init (GClueNMEASource *source)
>+{
>+        GClueNMEASourcePrivate *priv;
>+        AvahiServiceBrowser *service_browser;
>+        const AvahiPoll *poll_api;
>+        AvahiGLibPoll *glib_poll;
>+        int error;
>+
>+        source->priv = G_TYPE_INSTANCE_GET_PRIVATE ((source),
>+                                                    GCLUE_TYPE_NMEA_SOURCE,
>+                                                    GClueNMEASourcePrivate);
>+        priv = source->priv;
>+
>+        glib_poll = avahi_glib_poll_new (NULL, G_PRIORITY_DEFAULT);
>+        poll_api = avahi_glib_poll_get (glib_poll);
>+
>+        priv->cancellable = g_cancellable_new ();
>+
>+        priv->avahi_client = avahi_client_new (poll_api,
>+                                               0,
>+                                               client_callback,
>+                                               source,
>+                                               &error);
>+
>+        if (priv->avahi_client == NULL) {
>+                g_warning ("Failed to connect to avahi service: %s",
>+                           avahi_strerror (error));
>+                return;
>+        }
>+
>+        service_browser = avahi_service_browser_new
>+                (priv->avahi_client,
>+                 AVAHI_IF_UNSPEC,
>+                 AVAHI_PROTO_UNSPEC,
>+                 "_nmea-0183._tcp",
>+                 NULL,
>+                 0,
>+                 browse_callback,
>+                 source);
>+
>+
>+        if (service_browser == NULL) {
>+                const char *errorstr;
>+
>+                error = avahi_client_errno (priv->avahi_client);
>+                errorstr = avahi_strerror (error);
>+                g_warning ("Failed to browse avahi services: %s", errorstr);
>+        }
>+}
>+
>+/**
>+ * gclue_nmea_source_get_singleton:
>+ *
>+ * Get the #GClueNMEASource singleton.
>+ *
>+ * Returns: (transfer full): a new ref to #GClueNMEASource. Use g_object_unref()
>+ * when done.
>+ **/
>+GClueNMEASource *
>+gclue_nmea_source_get_singleton (void)
>+{
>+        static GClueNMEASource *source = NULL;
>+
>+        if (source == NULL) {
>+                source = g_object_new (GCLUE_TYPE_NMEA_SOURCE, NULL);
>+                g_object_add_weak_pointer (G_OBJECT (source),
>+                                           (gpointer) &source);
>+        } else
>+                g_object_ref (source);
>+
>+        return source;
>+}
>+
>+static gboolean
>+gclue_nmea_source_start (GClueLocationSource *source)
>+{
>+        GClueLocationSourceClass *base_class;
>+        GClueNMEASourcePrivate *priv;
>+        GList *all_services;
>+
>+        g_return_val_if_fail (GCLUE_IS_LOCATION_SOURCE (source), FALSE);
>+        priv = GCLUE_NMEA_SOURCE (source)->priv;
>+
>+        base_class = GCLUE_LOCATION_SOURCE_CLASS (gclue_nmea_source_parent_class);
>+        if (!base_class->start (source))
>+                return FALSE;
>+
>+        priv->client = g_socket_client_new ();
>+        g_cancellable_reset (priv->cancellable);
>+
>+        /* The service with the highest accuracy will be stored in the beginning
>+         * of the list.
>+         */
>+        all_services = priv->all_services;
>+        if (all_services != NULL) {
>+                priv->active_service = (AvahiServiceInfo *) all_services->data;
>+        }
>+
>+        if (priv->active_service == NULL) {
>+                return FALSE;
>+        }
>+
>+        g_socket_client_connect_to_host_async
>+                (priv->client,
>+                 priv->active_service->host_name,
>+                 priv->active_service->port,
>+                 priv->cancellable,
>+                 on_connection_to_location_server,
>+                 source);
>+
>+        return TRUE;
>+}
>+
>+static gboolean
>+gclue_nmea_source_stop (GClueLocationSource *source)
>+{
>+        GClueNMEASourcePrivate *priv = GCLUE_NMEA_SOURCE (source)->priv;
>+        GClueLocationSourceClass *base_class;
>+        GError *error = NULL;
>+
>+        g_return_val_if_fail (GCLUE_IS_LOCATION_SOURCE (source), FALSE);
>+
>+        base_class = GCLUE_LOCATION_SOURCE_CLASS (gclue_nmea_source_parent_class);
>+        if (!base_class->stop (source))
>+                return FALSE;
>+
>+        g_return_val_if_fail (G_IS_SOCKET_CONNECTION (priv->connection), TRUE);
>+
>+        g_cancellable_cancel (priv->cancellable);
>+
>+        g_io_stream_close (G_IO_STREAM (priv->connection),
>+                           NULL,
>+                           &error);
>+        if (error != NULL) {
>+                g_warning ("Error in closing socket connection");
>+
>+                return FALSE;
>+        }
>+
>+        g_object_unref (priv->client);
>+        g_object_unref (priv->connection);
>+        priv->active_service = NULL;
>+
>+        return TRUE;
>+}
>diff --git a/src/gclue-nmea-source.h b/src/gclue-nmea-source.h
>new file mode 100644
>index 0000000..6bcedc6
>--- /dev/null
>+++ b/src/gclue-nmea-source.h
>@@ -0,0 +1,71 @@
>+/* vim: set et ts=8 sw=8: */
>+/*
>+ * Copyright (C) 2014 Red Hat, Inc.
>+ * Copyright (C) 2015 Ankit (Verma)
>+ *
>+ * Geoclue 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.
>+ *
>+ * Geoclue 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 Geoclue; if not, write to the Free Software Foundation, Inc.,
>+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>+ *
>+ * Authors: Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
>+ *          Ankit (Verma) <ankitstarski@gmail.com>
>+ */
>+
>+#ifndef GCLUE_NMEA_SOURCE_H
>+#define GCLUE_NMEA_SOURCE_H
>+
>+#include <glib.h>
>+#include <gio/gio.h>
>+#include "gclue-location-source.h"
>+
>+G_BEGIN_DECLS
>+
>+GType gclue_nmea_source_get_type (void) G_GNUC_CONST;
>+
>+#define GCLUE_TYPE_NMEA_SOURCE            (gclue_nmea_source_get_type ())
>+#define GCLUE_NMEA_SOURCE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCLUE_TYPE_NMEA_SOURCE, GClueNMEASource))
>+#define GCLUE_IS_NMEA_SOURCE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GCLUE_TYPE_NMEA_SOURCE))
>+#define GCLUE_NMEA_SOURCE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GCLUE_TYPE_NMEA_SOURCE, GClueNMEASourceClass))
>+#define GCLUE_IS_NMEA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GCLUE_TYPE_NMEA_SOURCE))
>+#define GCLUE_NMEA_SOURCE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GCLUE_TYPE_NMEA_SOURCE, GClueNMEASourceClass))
>+
>+/**
>+ * GClueNMEASource:
>+ *
>+ * All the fields in the #GClueNMEASource structure are private and should never be accessed directly.
>+**/
>+typedef struct _GClueNMEASource        GClueNMEASource;
>+typedef struct _GClueNMEASourceClass   GClueNMEASourceClass;
>+typedef struct _GClueNMEASourcePrivate GClueNMEASourcePrivate;
>+
>+struct _GClueNMEASource {
>+        /* <private> */
>+        GClueLocationSource parent_instance;
>+        GClueNMEASourcePrivate *priv;
>+};
>+
>+/**
>+ * GClueNMEASourceClass:
>+ *
>+ * All the fields in the #GClueNMEASourceClass structure are private and should never be accessed directly.
>+**/
>+struct _GClueNMEASourceClass {
>+        /* <private> */
>+        GClueLocationSourceClass parent_class;
>+};
>+
>+GClueNMEASource * gclue_nmea_source_get_singleton (void);
>+
>+G_END_DECLS
>+
>+#endif /* GCLUE_NMEA_SOURCE_H */
>-- 
>2.4.3

Actions: View | Splinter Review

Attachments on bug 90974: 116488 | 116489 | 116490 | 116491 | 116634 | 116635 | 116636 | 116637 | 116948 | 116949 | 116950 | 116951 | 116952 | 116953 | 116954 | 116955 | 117149 | 117150 | 117151 | 117152 | 117391 | 117392 | 117393 | 117394 | 117450 | 117451 | 117452 | 117453 | 117733 | 117734 | 117735 | 117736 | 117755 | 117756 | 117857 | 117858 | 117859 | 117863 | 117864

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.