/hg/icedtea6: Renamed IcedTeaPlugin.{cc,h} back to IcedTeaNPPlug...
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Fri Mar 19 08:31:23 PDT 2010
changeset d8b7563f3f3d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d8b7563f3f3d
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Mar 19 11:31:17 2010 -0400
Renamed IcedTeaPlugin.{cc,h} back to IcedTeaNPPlugin.{cc,h}
Updated copyright dates.
diffstat:
16 files changed, 2467 insertions(+), 2444 deletions(-)
ChangeLog | 23
Makefile.am | 2
plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 2
plugin/icedteanp/IcedTeaJavaRequestProcessor.h | 4
plugin/icedteanp/IcedTeaNPPlugin.cc | 2294 +++++++++++++++++++++
plugin/icedteanp/IcedTeaNPPlugin.h | 134 +
plugin/icedteanp/IcedTeaPlugin.cc | 2294 ---------------------
plugin/icedteanp/IcedTeaPlugin.h | 134 -
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 4
plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 2
plugin/icedteanp/IcedTeaPluginUtils.cc | 4
plugin/icedteanp/IcedTeaPluginUtils.h | 4
plugin/icedteanp/IcedTeaRunnable.cc | 2
plugin/icedteanp/IcedTeaRunnable.h | 2
plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 2
plugin/icedteanp/IcedTeaScriptablePluginObject.h | 4
diffs (truncated from 5069 to 500 lines):
diff -r 3fa0b8d84878 -r d8b7563f3f3d ChangeLog
--- a/ChangeLog Fri Mar 19 14:47:16 2010 +0000
+++ b/ChangeLog Fri Mar 19 11:31:17 2010 -0400
@@ -1,3 +1,26 @@ 2010-03-19 Pavel Tisnovsky <ptisnovs at re
+2010-03-19 Deepak Bhole <dbhole at redhat.com>
+
+ * Makefile.am: Updated to use the renamed IcedTeaNPPlugin.cc file.
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Updated copyright.
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Update to include
+ IcedTeaNPPlugin.h instead of IcedTeaPlugin.h. Updated copyright.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: Renamed from IcedTeaPlugin.cc.
+ Updated copyright.
+ * plugin/icedteanp/IcedTeaNPPlugin.h: Renamed from IcedTeaPlugin.h.
+ Updated copyright.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Updated copyright.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Update to include
+ IcedTeaNPPlugin.h instead of IcedTeaPlugin.h. Updated copyright.
+ * plugin/icedteanp/IcedTeaPluginUtils.cc: Updated copyright.
+ * plugin/icedteanp/IcedTeaPluginUtils.h: Update to include
+ IcedTeaNPPlugin.h instead of IcedTeaPlugin.h. Updated copyright.
+ * plugin/icedteanp/IcedTeaRunnable.cc: Updated copyright.
+ * plugin/icedteanp/IcedTeaRunnable.h: Update to include
+ IcedTeaNPPlugin.h instead of IcedTeaPlugin.h. Updated copyright.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Updated copyright.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Update to include
+ IcedTeaNPPlugin.h instead of IcedTeaPlugin.h. Updated copyright.
+
2010-03-19 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/icedtea-sh4-support.patch: removed duplicated
diff -r 3fa0b8d84878 -r d8b7563f3f3d Makefile.am
--- a/Makefile.am Fri Mar 19 14:47:16 2010 +0000
+++ b/Makefile.am Fri Mar 19 11:31:17 2010 -0400
@@ -1570,7 +1570,7 @@ if ENABLE_PLUGIN
# is listed before -l options. See:
# http://developer.mozilla.org/en/docs/XPCOM_Glue
-PLUGIN_SRC=IcedTeaPlugin.cc IcedTeaScriptablePluginObject.cc \
+PLUGIN_SRC=IcedTeaNPPlugin.cc IcedTeaScriptablePluginObject.cc \
IcedTeaJavaRequestProcessor.cc IcedTeaPluginRequestProcessor.cc \
IcedTeaPluginUtils.cc
diff -r 3fa0b8d84878 -r d8b7563f3f3d plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Fri Mar 19 14:47:16 2010 +0000
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Fri Mar 19 11:31:17 2010 -0400
@@ -1,6 +1,6 @@
/* IcedTeaJavaRequestProcessor.cc
- Copyright (C) 2009 Red Hat
+ Copyright (C) 2009, 2010 Red Hat
This file is part of IcedTea.
diff -r 3fa0b8d84878 -r d8b7563f3f3d plugin/icedteanp/IcedTeaJavaRequestProcessor.h
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.h Fri Mar 19 14:47:16 2010 +0000
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.h Fri Mar 19 11:31:17 2010 -0400
@@ -1,6 +1,6 @@
/* IcedTeaJavaRequestProcessor.h
- Copyright (C) 2009 Red Hat
+ Copyright (C) 2009, 2010 Red Hat
This file is part of IcedTea.
@@ -43,7 +43,7 @@ exception statement from your version. *
#include <stdlib.h>
#include <vector>
-#include "IcedTeaPlugin.h"
+#include "IcedTeaNPPlugin.h"
#include "IcedTeaPluginUtils.h"
#define REQUESTTIMEOUT 120
diff -r 3fa0b8d84878 -r d8b7563f3f3d plugin/icedteanp/IcedTeaNPPlugin.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Mar 19 11:31:17 2010 -0400
@@ -0,0 +1,2294 @@
+/* IcedTeaPlugin.cc -- web browser plugin to execute Java applets
+ Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010 Red Hat
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+
+GNU Classpath 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 GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+// System includes.
+#include <dlfcn.h>
+#include <errno.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+// Liveconnect extension
+#include "IcedTeaScriptablePluginObject.h"
+#include "IcedTeaNPPlugin.h"
+
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+// Documentbase retrieval includes.
+#include <nsIPluginInstance.h>
+#include <nsIPluginInstancePeer.h>
+#include <nsIPluginTagInfo2.h>
+
+// API's into Mozilla
+#include <nsCOMPtr.h>
+#include <nsICookieService.h>
+#include <nsIDNSRecord.h>
+#include <nsIDNSService.h>
+#include <nsINetUtil.h>
+#include <nsIProxyInfo.h>
+#include <nsIProtocolProxyService.h>
+#include <nsIScriptSecurityManager.h>
+#include <nsIIOService.h>
+#include <nsIURI.h>
+#include <nsNetCID.h>
+#include <nsStringAPI.h>
+#include <nsServiceManagerUtils.h>
+#endif
+
+// Error reporting macros.
+#define PLUGIN_ERROR(message) \
+ g_printerr ("%s:%d: thread %p: Error: %s\n", __FILE__, __LINE__, \
+ g_thread_self (), message)
+
+#define PLUGIN_ERROR_TWO(first, second) \
+ g_printerr ("%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__, \
+ g_thread_self (), first, second)
+
+#define PLUGIN_ERROR_THREE(first, second, third) \
+ g_printerr ("%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__, \
+ __LINE__, g_thread_self (), first, second, third)
+
+// Plugin information passed to about:plugins.
+#define PLUGIN_NAME "IcedTea NPR Web Browser Plugin (using " PLUGIN_VERSION ")"
+#define PLUGIN_DESC "The " PLUGIN_NAME " executes Java applets."
+
+#define PLUGIN_MIME_DESC \
+ "application/x-java-vm:class,jar:IcedTea;" \
+ "application/x-java-applet:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.1:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.1.1:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.1.2:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.1.3:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.2:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.2.1:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.2.2:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.3:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.3.1:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.4:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.4.1:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.4.2:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.5:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.6:class,jar:IcedTea;" \
+ "application/x-java-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" \
+ "application/x-java-bean:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.1:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.1.1:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.1.2:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.1.3:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.2:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.2.1:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.2.2:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.3:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.3.1:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.4:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.4.1:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.4.2:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.5:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.6:class,jar:IcedTea;" \
+ "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" \
+ "application/x-java-vm-npruntime::IcedTea;"
+
+#define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
+#define PLUGIN_MIME_TYPE "application/x-java-vm"
+#define PLUGIN_FILE_EXTS "class,jar,zip"
+#define PLUGIN_MIME_COUNT 1
+
+#define FAILURE_MESSAGE "gcjwebplugin error: Failed to run %s." \
+ " For more detail rerun \"firefox -g\" in a terminal window."
+
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+// Documentbase retrieval required definition.
+static NS_DEFINE_IID (kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID);
+#endif
+
+// Data directory for plugin.
+static gchar* data_directory = NULL;
+
+// Fully-qualified appletviewer executable.
+static gchar* appletviewer_executable = NULL;
+
+// Applet viewer input channel (needs to be static because it is used in plugin_in_pipe_callback)
+static GIOChannel* in_from_appletviewer = NULL;
+
+// Applet viewer input pipe name.
+gchar* in_pipe_name;
+
+// Applet viewer input watch source.
+gint in_watch_source;
+
+// Applet viewer output pipe name.
+gchar* out_pipe_name;
+
+// Applet viewer output watch source.
+gint out_watch_source;
+
+// Applet viewer output channel.
+GIOChannel* out_to_appletviewer;
+
+// Tracks jvm status
+gboolean jvm_up = FALSE;
+
+// Keeps track of initialization. NP_Initialize should only be
+// called once.
+gboolean initialized = false;
+
+// browser functions into mozilla
+NPNetscapeFuncs browser_functions;
+
+// Various message buses carrying information to/from Java, and internally
+MessageBus* plugin_to_java_bus;
+MessageBus* java_to_plugin_bus;
+//MessageBus* internal_bus = new MessageBus();
+
+// Processor for plugin requests
+PluginRequestProcessor* plugin_req_proc;
+
+// Sends messages to Java over the bus
+JavaMessageSender* java_req_proc;
+
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+// Documentbase retrieval type-punning union.
+typedef union
+{
+ void** void_field;
+ nsIPluginTagInfo2** info_field;
+} info_union;
+#endif
+
+// Static instance helper functions.
+// Have the browser allocate a new GCJPluginData structure.
+static void plugin_data_new (GCJPluginData** data);
+// Retrieve the current document's documentbase.
+static gchar* plugin_get_documentbase (NPP instance);
+// Notify the user that the appletviewer is not installed correctly.
+static void plugin_display_failure_dialog ();
+// Callback used to monitor input pipe status.
+static gboolean plugin_in_pipe_callback (GIOChannel* source,
+ GIOCondition condition,
+ gpointer plugin_data);
+// Callback used to monitor output pipe status.
+static gboolean plugin_out_pipe_callback (GIOChannel* source,
+ GIOCondition condition,
+ gpointer plugin_data);
+static NPError plugin_start_appletviewer (GCJPluginData* data);
+static gchar* plugin_create_applet_tag (int16_t argc, char* argn[],
+ char* argv[]);
+static void plugin_stop_appletviewer ();
+// Uninitialize GCJPluginData structure
+static void plugin_data_destroy (NPP instance);
+
+NPError get_cookie_info(const char* siteAddr, char** cookieString, uint32_t* len);
+NPError get_proxy_info(const char* siteAddr, char** proxy, uint32_t* len);
+void consume_message(gchar* message);
+void start_jvm_if_needed();
+static void appletviewer_monitor(GPid pid, gint status, gpointer data);
+
+// Global instance counter.
+// Mutex to protect plugin_instance_counter.
+static GMutex* plugin_instance_mutex = NULL;
+// A global variable for reporting GLib errors. This must be free'd
+// and set to NULL after each use.
+static GError* channel_error = NULL;
+
+static GHashTable* instance_to_id_map = g_hash_table_new(NULL, NULL);
+static GHashTable* id_to_instance_map = g_hash_table_new(NULL, NULL);
+static gint instance_counter = 1;
+static GPid appletviewer_pid = -1;
+static guint appletviewer_watch_id = -1;
+
+int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
+
+pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER;
+
+// Functions prefixed by GCJ_ are instance functions. They are called
+// by the browser and operate on instances of GCJPluginData.
+// Functions prefixed by plugin_ are static helper functions.
+// Functions prefixed by NP_ are factory functions. They are called
+// by the browser and provide functionality needed to create plugin
+// instances.
+
+// INSTANCE FUNCTIONS
+
+// Creates a new gcjwebplugin instance. This function creates a
+// GCJPluginData* and stores it in instance->pdata. The following
+// GCJPluginData fiels are initialized: instance_string, in_pipe_name,
+// in_from_appletviewer, in_watch_source, out_pipe_name,
+// out_to_appletviewer, out_watch_source, appletviewer_mutex, owner,
+// appletviewer_alive. In addition two pipe files are created. All
+// of those fields must be properly destroyed, and the pipes deleted,
+// by GCJ_Destroy. If an error occurs during initialization then this
+// function will free anything that's been allocated so far, set
+// instance->pdata to NULL and return an error code.
+NPError
+GCJ_New (NPMIMEType pluginType, NPP instance, uint16_t mode,
+ int16_t argc, char* argn[], char* argv[],
+ NPSavedData* saved)
+{
+ PLUGIN_DEBUG_0ARG("GCJ_New\n");
+
+ static NPObject *window_ptr;
+ NPIdentifier identifier;
+ NPVariant member_ptr;
+ browser_functions.getvalue(instance, NPNVWindowNPObject, &window_ptr);
+ identifier = browser_functions.getstringidentifier("document");
+ printf("Looking for %p %p %p (%s)\n", instance, window_ptr, identifier, "document");
+ if (!browser_functions.hasproperty(instance, window_ptr, identifier))
+ {
+ printf("%s not found!\n", "document");
+ }
+ browser_functions.getproperty(instance, window_ptr, identifier, &member_ptr);
+
+ PLUGIN_DEBUG_1ARG("Got variant %p\n", &member_ptr);
+
+
+ NPError np_error = NPERR_NO_ERROR;
+ GCJPluginData* data = NULL;
+
+ gchar* documentbase = NULL;
+ gchar* read_message = NULL;
+ gchar* applet_tag = NULL;
+ gchar* tag_message = NULL;
+ gchar* cookie_info = NULL;
+
+ NPObject* npPluginObj = NULL;
+
+ if (!instance)
+ {
+ PLUGIN_ERROR ("Browser-provided instance pointer is NULL.");
+ np_error = NPERR_INVALID_INSTANCE_ERROR;
+ goto cleanup_done;
+ }
+
+ // data
+ plugin_data_new (&data);
+ if (data == NULL)
+ {
+ PLUGIN_ERROR ("Failed to allocate plugin data.");
+ np_error = NPERR_OUT_OF_MEMORY_ERROR;
+ goto cleanup_done;
+ }
+
+ // start the jvm if needed
+ start_jvm_if_needed();
+
+ // Initialize data->instance_string.
+ //
+ // instance_string should be unique for this process so we use a
+ // combination of getpid and plugin_instance_counter.
+ //
+ // Critical region. Reference and increment plugin_instance_counter
+ // global.
+ g_mutex_lock (plugin_instance_mutex);
+
+ // data->instance_string
+ data->instance_string = g_strdup_printf ("%d",
+ instance_counter);
+
+ g_mutex_unlock (plugin_instance_mutex);
+
+ // data->appletviewer_mutex
+ data->appletviewer_mutex = g_mutex_new ();
+
+ g_mutex_lock (data->appletviewer_mutex);
+
+ // Documentbase retrieval.
+ documentbase = plugin_get_documentbase (instance);
+ if (documentbase && argc != 0)
+ {
+ // Send applet tag message to appletviewer.
+ applet_tag = plugin_create_applet_tag (argc, argn, argv);
+
+ tag_message = (gchar*) malloc(strlen(applet_tag)*sizeof(gchar) + strlen(documentbase)*sizeof(gchar) + 32);
+ g_sprintf(tag_message, "instance %d tag %s %s", instance_counter, documentbase, applet_tag);
+
+ //plugin_send_message_to_appletviewer (data, data->instance_string);
+ plugin_send_message_to_appletviewer (tag_message);
+
+ data->is_applet_instance = true;
+ }
+
+ if (argc == 0)
+ {
+ data->is_applet_instance = false;
+ }
+
+ g_mutex_unlock (data->appletviewer_mutex);
+
+ // If initialization succeeded entirely then we store the plugin
+ // data in the instance structure and return. Otherwise we free the
+ // data we've allocated so far and set instance->pdata to NULL.
+
+ // Set back-pointer to owner instance.
+ data->owner = instance;
+
+ // source of this instance
+ // don't use documentbase, it is cleared later
+ data->source = plugin_get_documentbase(instance);
+
+ instance->pdata = data;
+
+ goto cleanup_done;
+
+ cleanup_appletviewer_mutex:
+ g_free (data->appletviewer_mutex);
+ data->appletviewer_mutex = NULL;
+
+ // cleanup_instance_string:
+ g_free (data->instance_string);
+ data->instance_string = NULL;
+
+ // cleanup_data:
+ // Eliminate back-pointer to plugin instance.
+ data->owner = NULL;
+ (*browser_functions.memfree) (data);
+ data = NULL;
+
+ // Initialization failed so return a NULL pointer for the browser
+ // data.
+ instance->pdata = NULL;
+
+ cleanup_done:
+ g_free (tag_message);
+ tag_message = NULL;
+ g_free (applet_tag);
+ applet_tag = NULL;
+ g_free (read_message);
+ read_message = NULL;
+ g_free (documentbase);
+ documentbase = NULL;
+
+ // store an identifier for this plugin
+ PLUGIN_DEBUG_2ARG("Mapping id %d and instance %p\n", instance_counter, instance);
+ g_hash_table_insert(instance_to_id_map, instance, GINT_TO_POINTER(instance_counter));
+ g_hash_table_insert(id_to_instance_map, GINT_TO_POINTER(instance_counter), instance);
+ instance_counter++;
+
+ PLUGIN_DEBUG_0ARG ("GCJ_New return\n");
+
+ return np_error;
+}
+
+// Starts the JVM if it is not already running
+void start_jvm_if_needed()
+{
+
+ // This is asynchronized function. It must
+ // have exclusivity when running.
+
+ GMutex *vm_start_mutex = g_mutex_new();
+ g_mutex_lock(vm_start_mutex);
+
+ PLUGIN_DEBUG_0ARG("Checking JVM status...\n");
+
+ // If the jvm is already up, do nothing
+ if (jvm_up)
+ {
More information about the distro-pkg-dev
mailing list