Linux: de-obfuscate dbus handling; better handle_secondlifeprotocol.sh.

8 files changed, 15 insertions, 259 deletions

diff --git a/linden/indra/cmake/DBusGlib.cmake b/linden/indra/cmake/DBusGlib.cmake
index cfc4ccd..dfda0ad 100644
--- a/linden/indra/cmake/DBusGlib.cmake
+++ b/linden/indra/cmake/DBusGlib.cmake
@@ -12,9 +12,9 @@ elseif (LINUX)
   set(DBUSGLIB_INCLUDE_DIRS
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
       )
-  # We don't need to explicitly link against dbus-glib itself, because
-  # the viewer probes for the system's copy at runtime.
+
   set(DBUSGLIB_LIBRARIES
+      dbus-glib-1
       gobject-2.0
       glib-2.0
       )
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index d5b50cf..f522f44 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -939,7 +939,6 @@ endif (DARWIN)
 
 if (LINUX)
     LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
-    LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp)
     LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
 
     set(viewer_LIBRARIES
diff --git a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
index 3613070..422d4dd 100755
--- a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
+++ b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
@@ -13,5 +13,7 @@ fi
 RUN_PATH=`dirname "$0" || echo .`
 cd "${RUN_PATH}"
 
-exec ./imprudence -url \'"${URL}"\'
-
+#yeah, why just send a dbus message  if we can spawn a whole new instance of the viewer just for sending the message?
+#exec ./imprudence -url \'"${URL}"\'
+#</sarcasm>
+exec dbus-send --type=method_call --dest=com.secondlife.ViewerAppAPIService /com/secondlife/ViewerAppAPI com.secondlife.ViewerAppAPI.GoSLURL string:"$1"
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index 4956e9d..d2ed5d2 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -64,14 +64,7 @@
 #endif
 
 #if LL_DBUS_ENABLED
-# include "llappviewerlinux_api_dbus.h"
-
-// regrettable hacks to give us better runtime compatibility with older systems inside llappviewerlinux_api.h:
-#define llg_return_if_fail(COND) do{if (!(COND)) return;}while(0)
-#undef g_return_if_fail
-#define g_return_if_fail(COND) llg_return_if_fail(COND)
-// The generated API
-# include "llappviewerlinux_api.h"
+#include "llappviewerlinux_api.h"
 #endif
 
 namespace
@@ -372,29 +365,6 @@ static void viewerappapi_class_init(ViewerAppAPIClass *klass);
 
 ///
 
-// regrettable hacks to give us better runtime compatibility with older systems in general
-static GType llg_type_register_static_simple_ONCE(GType parent_type,
-                                                  const gchar *type_name,
-                                                  guint class_size,
-                                                  GClassInitFunc class_init,
-                                                  guint instance_size,
-                                                  GInstanceInitFunc instance_init,
-                                                  GTypeFlags flags)
-{
-        static GTypeInfo type_info;
-        memset(&type_info, 0, sizeof(type_info));
-
-        type_info.class_size = class_size;
-        type_info.class_init = class_init;
-        type_info.instance_size = instance_size;
-        type_info.instance_init = instance_init;
-
-        return g_type_register_static(parent_type, type_name, &type_info, flags);
-}
-#define llg_intern_static_string(S) (S)
-#define g_intern_static_string(S) llg_intern_static_string(S)
-#define g_type_register_static_simple(parent_type, type_name, class_size, class_init, instance_size, instance_init, flags) llg_type_register_static_simple_ONCE(parent_type, type_name, class_size, class_init, instance_size, instance_init, flags)
-
 G_DEFINE_TYPE(ViewerAppAPI, viewerappapi, G_TYPE_OBJECT);
 
 void viewerappapi_class_init(ViewerAppAPIClass *klass)
@@ -411,18 +381,18 @@ void viewerappapi_init(ViewerAppAPI *server)
         {
                 GError *error = NULL;
                 
-                server->connection = lldbus_g_bus_get(DBUS_BUS_SESSION, &error);
+                server->connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
                 if (server->connection)
                 {
-                        lldbus_g_object_type_install_info(viewerappapi_get_type(), &dbus_glib_viewerapp_object_info);
+                        dbus_g_object_type_install_info(viewerappapi_get_type(), &dbus_glib_viewerapp_object_info);
                         
-                        lldbus_g_connection_register_g_object(server->connection, VIEWERAPI_PATH, G_OBJECT(server));
+                        dbus_g_connection_register_g_object(server->connection, VIEWERAPI_PATH, G_OBJECT(server));
                         
-                        DBusGProxy *serverproxy = lldbus_g_proxy_new_for_name(server->connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
+                        DBusGProxy *serverproxy = dbus_g_proxy_new_for_name(server->connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
 
                         guint request_name_ret_unused;
                         // akin to org_freedesktop_DBus_request_name
-                        if (lldbus_g_proxy_call(serverproxy, "RequestName", &error, G_TYPE_STRING, VIEWERAPI_SERVICE, G_TYPE_UINT, 0, G_TYPE_INVALID, G_TYPE_UINT, &request_name_ret_unused, G_TYPE_INVALID))
+                        if (dbus_g_proxy_call(serverproxy, "RequestName", &error, G_TYPE_STRING, VIEWERAPI_SERVICE, G_TYPE_UINT, 0, G_TYPE_INVALID, G_TYPE_UINT, &request_name_ret_unused, G_TYPE_INVALID))
                         {
                                 // total success.
                                 dbus_server_init = true;
@@ -472,11 +442,6 @@ gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **succ
 //virtual
 bool LLAppViewerLinux::initSLURLHandler()
 {
-        if (!grab_dbus_syms(DBUSGLIB_DYLIB_DEFAULT_NAME))
-        {
-                return false; // failed
-        }
-
         g_type_init();
 
         //ViewerAppAPI *api_server = (ViewerAppAPI*)
@@ -488,25 +453,20 @@ bool LLAppViewerLinux::initSLURLHandler()
 //virtual
 bool LLAppViewerLinux::sendURLToOtherInstance(const std::string& url)
 {
-        if (!grab_dbus_syms(DBUSGLIB_DYLIB_DEFAULT_NAME))
-        {
-                return false; // failed
-        }
-
         bool success = false;
         DBusGConnection *bus;
         GError *error = NULL;
 
         g_type_init();
         
-        bus = lldbus_g_bus_get (DBUS_BUS_SESSION, &error);
+        bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
         if (bus)
         {
                 gboolean rtn = FALSE;
                 DBusGProxy *remote_object =
-                        lldbus_g_proxy_new_for_name(bus, VIEWERAPI_SERVICE, VIEWERAPI_PATH, VIEWERAPI_INTERFACE);
+                        dbus_g_proxy_new_for_name(bus, VIEWERAPI_SERVICE, VIEWERAPI_PATH, VIEWERAPI_INTERFACE);
 
-                if (lldbus_g_proxy_call(remote_object, "GoSLURL", &error,
+                if (dbus_g_proxy_call(remote_object, "GoSLURL", &error,
                                         G_TYPE_STRING, url.c_str(), G_TYPE_INVALID,
                                        G_TYPE_BOOLEAN, &rtn, G_TYPE_INVALID))
                 {
diff --git a/linden/indra/newview/llappviewerlinux_api.xml b/linden/indra/newview/llappviewerlinux_api.xml
deleted file mode 100644
index fac35b7..0000000
--- a/linden/indra/newview/llappviewerlinux_api.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- dbus-binding-tool -mode=glib-server llappviewerlinux_api.xml -prefix=viewerapp -output=llappviewerlinux_api.h -->
-
-<node name="/com/secondlife/ViewerAppAPI">
-  <interface name="com.secondlife.ViewerAppAPI">
-    <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="viewer_app_api"/>
-    <method name="GoSLURL">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="viewer_app_api_GoSLURL"/>
-      <arg type="s" name="slurl" direction="in" />
-      <arg type="b" name="success_ret" direction="out" />
-    </method>
-  </interface>
-</node>
diff --git a/linden/indra/newview/llappviewerlinux_api_dbus.cpp b/linden/indra/newview/llappviewerlinux_api_dbus.cpp
deleted file mode 100644
index ee160d0..0000000
--- a/linden/indra/newview/llappviewerlinux_api_dbus.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/** 
- * @file llappviewerlinux_api_dbus.cpp
- * @brief dynamic DBus symbol-grabbing code
- *
- * $LicenseInfo:firstyear=2008&license=viewergpl$
- * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#if LL_DBUS_ENABLED
-
-#include "linden_common.h"
-
-extern "C" {
-#include <dbus/dbus-glib.h>
-
-#include "apr_pools.h"
-#include "apr_dso.h"
-}
-
-#define DEBUGMSG(...) lldebugs << llformat(__VA_ARGS__) << llendl
-#define INFOMSG(...) llinfos << llformat(__VA_ARGS__) << llendl
-#define WARNMSG(...) llwarns << llformat(__VA_ARGS__) << llendl
-
-#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) RTN (*ll##DBUSSYM)(__VA_ARGS__) = NULL
-#include "llappviewerlinux_api_dbus_syms_raw.inc"
-#undef LL_DBUS_SYM
-
-static bool sSymsGrabbed = false;
-static apr_pool_t *sSymDBUSDSOMemoryPool = NULL;
-static apr_dso_handle_t *sSymDBUSDSOHandleG = NULL;
-
-bool grab_dbus_syms(std::string dbus_dso_name)
-{
-        if (sSymsGrabbed)
-        {
-                // already have grabbed good syms
-                return TRUE;
-        }
-
-        bool sym_error = false;
-        bool rtn = false;
-        apr_status_t rv;
-        apr_dso_handle_t *sSymDBUSDSOHandle = NULL;
-
-#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) do{rv = apr_dso_sym((apr_dso_handle_sym_t*)&ll##DBUSSYM, sSymDBUSDSOHandle, #DBUSSYM); if (rv != APR_SUCCESS) {INFOMSG("Failed to grab symbol: %s", #DBUSSYM); if (REQUIRED) sym_error = true;} else DEBUGMSG("grabbed symbol: %s from %p", #DBUSSYM, (void*)ll##DBUSSYM);}while(0)
-
-        //attempt to load the shared library
-        apr_pool_create(&sSymDBUSDSOMemoryPool, NULL);
-  
-        if ( APR_SUCCESS == (rv = apr_dso_load(&sSymDBUSDSOHandle,
-                                               dbus_dso_name.c_str(),
-                                               sSymDBUSDSOMemoryPool) ))
-        {
-                INFOMSG("Found DSO: %s", dbus_dso_name.c_str());
-
-#include "llappviewerlinux_api_dbus_syms_raw.inc"
-      
-                if ( sSymDBUSDSOHandle )
-                {
-                        sSymDBUSDSOHandleG = sSymDBUSDSOHandle;
-                        sSymDBUSDSOHandle = NULL;
-                }
-      
-                rtn = !sym_error;
-        }
-        else
-        {
-                INFOMSG("Couldn't load DSO: %s", dbus_dso_name.c_str());
-                rtn = false; // failure
-        }
-
-        if (sym_error)
-        {
-                WARNMSG("Failed to find necessary symbols in DBUS-GLIB libraries.");
-        }
-#undef LL_DBUS_SYM
-
-        sSymsGrabbed = rtn;
-        return rtn;
-}
-
-
-void ungrab_dbus_syms()
-{ 
-        // should be safe to call regardless of whether we've
-        // actually grabbed syms.
-
-        if ( sSymDBUSDSOHandleG )
-        {
-                apr_dso_unload(sSymDBUSDSOHandleG);
-                sSymDBUSDSOHandleG = NULL;
-        }
-        
-        if ( sSymDBUSDSOMemoryPool )
-        {
-                apr_pool_destroy(sSymDBUSDSOMemoryPool);
-                sSymDBUSDSOMemoryPool = NULL;
-        }
-        
-        // NULL-out all of the symbols we'd grabbed
-#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) do{ll##DBUSSYM = NULL;}while(0)
-#include "llappviewerlinux_api_dbus_syms_raw.inc"
-#undef LL_DBUS_SYM
-
-        sSymsGrabbed = false;
-}
-
-#endif // LL_DBUS_ENABLED
diff --git a/linden/indra/newview/llappviewerlinux_api_dbus.h b/linden/indra/newview/llappviewerlinux_api_dbus.h
deleted file mode 100644
index 1f5468b..0000000
--- a/linden/indra/newview/llappviewerlinux_api_dbus.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/** 
- * @file llappviewerlinux_api_dbus.h
- * @brief DBus-glib symbol handling
- *
- * $LicenseInfo:firstyear=2008&license=viewergpl$
- * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#if LL_DBUS_ENABLED
-
-extern "C" {
-#include <dbus/dbus-glib.h>
-}
-
-#define DBUSGLIB_DYLIB_DEFAULT_NAME "libdbus-glib-1.so.2"
-
-bool grab_dbus_syms(std::string dbus_dso_name);
-void ungrab_dbus_syms();
-
-#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) extern RTN (*ll##DBUSSYM)(__VA_ARGS__)
-#include "llappviewerlinux_api_dbus_syms_raw.inc"
-#undef LL_DBUS_SYM
-
-#endif // LL_DBUS_ENABLED
diff --git a/linden/indra/newview/llappviewerlinux_api_dbus_syms_raw.inc b/linden/indra/newview/llappviewerlinux_api_dbus_syms_raw.inc
deleted file mode 100644
index c0548e2..0000000
--- a/linden/indra/newview/llappviewerlinux_api_dbus_syms_raw.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-
-// required symbols to grab
-LL_DBUS_SYM(true, dbus_g_bus_get, DBusGConnection*, DBusBusType, GError**);
-LL_DBUS_SYM(true, dbus_g_proxy_new_for_name, DBusGProxy*, DBusGConnection*, const char *, const char*, const char*);
-LL_DBUS_SYM(true, dbus_g_proxy_call, gboolean, DBusGProxy*, const char*, GError**, GType, ...);
-LL_DBUS_SYM(true, dbus_g_object_type_install_info, void, GType, const DBusGObjectInfo*);
-LL_DBUS_SYM(true, dbus_g_connection_register_g_object, void, DBusGConnection*, const char*, GObject*);
-
-// optional symbols to grab