gnome-mud r793 - in trunk: . src
- From: lharris svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-mud r793 - in trunk: . src
- Date: Sun, 15 Mar 2009 00:34:27 +0000 (UTC)
Author: lharris
Date: Sun Mar 15 00:34:27 2009
New Revision: 793
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=793&view=rev
Log:
NEW-ENVIRON Telnet Option Support
Added:
trunk/src/mud-telnet-new-environ.c
trunk/src/mud-telnet-new-environ.h
Modified:
trunk/ChangeLog
trunk/src/Makefile.am
trunk/src/mud-telnet.c
trunk/src/mud-telnet.h
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Sun Mar 15 00:34:27 2009
@@ -60,6 +60,8 @@
mud-telnet-msp.h \
mud-telnet-mssp.c \
mud-telnet-mssp.h \
+ mud-telnet-new-environ.c \
+ mud-telnet-new-environ.h \
mud-telnet-zmp.c \
mud-telnet-zmp.h \
mud-tray.c \
Added: trunk/src/mud-telnet-new-environ.c
==============================================================================
--- (empty file)
+++ trunk/src/mud-telnet-new-environ.c Sun Mar 15 00:34:27 2009
@@ -0,0 +1,435 @@
+/* GNOME-Mud - A simple Mud Client
+ * mud-telnet-new-environ.c
+ * Copyright (C) 2005-2009 Les Harris <lharris gnome org>
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib.h>
+#include <glib-object.h>
+#include <glib/gi18n.h>
+
+#include "gnome-mud.h"
+#include "mud-telnet.h"
+#include "mud-telnet-handler-interface.h"
+#include "mud-telnet-new-environ.h"
+
+struct _MudTelnetNewEnvironPrivate
+{
+ /* Interface Properties */
+ MudTelnet *telnet;
+ gboolean enabled;
+ gint option;
+
+ /* Private Instance Members */
+ GHashTable *new_environ_data;
+};
+
+/* Property Identifiers */
+enum
+{
+ PROP_MUD_TELNET_NEWENVIRON_0,
+ PROP_ENABLED,
+ PROP_HANDLES_OPTION,
+ PROP_TELNET,
+ PROP_ENVIRON
+};
+
+enum
+{
+ PARSE_STATE_VAR,
+ PARSE_STATE_VAR_STRING,
+ PARSE_STATE_VAL,
+ PARSE_STATE_VAL_STRING
+};
+
+/* Class Functions */
+static void mud_telnet_newenviron_init (MudTelnetNewEnviron *self);
+static void mud_telnet_newenviron_class_init (MudTelnetNewEnvironClass *klass);
+static void mud_telnet_newenviron_interface_init(MudTelnetHandlerInterface *iface);
+static void mud_telnet_newenviron_finalize (GObject *object);
+static GObject *mud_telnet_newenviron_constructor (GType gtype,
+ guint n_properties,
+ GObjectConstructParam *properties);
+static void mud_telnet_newenviron_set_property(GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void mud_telnet_newenviron_get_property(GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+/*Interface Implementation */
+void mud_telnet_newenviron_enable(MudTelnetHandler *self);
+void mud_telnet_newenviron_disable(MudTelnetHandler *self);
+void mud_telnet_newenviron_handle_sub_neg(MudTelnetHandler *self,
+ guchar *buf,
+ guint len);
+
+/* Private Methods */
+static void mud_telnet_newenviron_destroy_key(gpointer k);
+static void mud_telnet_newenviron_destroy_value(gpointer c);
+
+/* Create the Type. We implement MudTelnetHandlerInterface */
+G_DEFINE_TYPE_WITH_CODE(MudTelnetNewEnviron, mud_telnet_newenviron, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (MUD_TELNET_HANDLER_TYPE,
+ mud_telnet_newenviron_interface_init));
+/* MudTelnetNewEnviron class functions */
+static void
+mud_telnet_newenviron_class_init (MudTelnetNewEnvironClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+ /* Override base object constructor */
+ object_class->constructor = mud_telnet_newenviron_constructor;
+
+ /* Override base object's finalize */
+ object_class->finalize = mud_telnet_newenviron_finalize;
+
+ /* Override base object property methods */
+ object_class->set_property = mud_telnet_newenviron_set_property;
+ object_class->get_property = mud_telnet_newenviron_get_property;
+
+ /* Add private data to class */
+ g_type_class_add_private(klass, sizeof(MudTelnetNewEnvironPrivate));
+
+ /* Override Implementation Properties */
+ g_object_class_override_property(object_class,
+ PROP_ENABLED,
+ "enabled");
+
+ g_object_class_override_property(object_class,
+ PROP_HANDLES_OPTION,
+ "handles-option");
+
+ g_object_class_override_property(object_class,
+ PROP_TELNET,
+ "telnet");
+ /* Custom Class Properties */
+ g_object_class_install_property(object_class,
+ PROP_ENVIRON,
+ g_param_spec_pointer("new-environ-data",
+ "NEW-ENVIRON Data",
+ "The Environ data provided by the mud.",
+ G_PARAM_READABLE));
+}
+
+static void
+mud_telnet_newenviron_interface_init(MudTelnetHandlerInterface *iface)
+{
+ iface->Enable = mud_telnet_newenviron_enable;
+ iface->Disable = mud_telnet_newenviron_disable;
+ iface->HandleSubNeg = mud_telnet_newenviron_handle_sub_neg;
+}
+
+static void
+mud_telnet_newenviron_init (MudTelnetNewEnviron *self)
+{
+ /* Get our private data */
+ self->priv = MUD_TELNET_NEWENVIRON_GET_PRIVATE(self);
+
+ /* Set the defaults */
+ self->priv->telnet = NULL;
+ self->priv->option = TELOPT_NEWENVIRON;
+ self->priv->enabled = FALSE;
+
+ self->priv->new_environ_data = NULL;
+}
+
+static GObject *
+mud_telnet_newenviron_constructor (GType gtype,
+ guint n_properties,
+ GObjectConstructParam *properties)
+{
+ MudTelnetNewEnviron *self;
+ GObject *obj;
+ MudTelnetNewEnvironClass *klass;
+ GObjectClass *parent_class;
+
+ /* Chain up to parent constructor */
+ klass = MUD_TELNET_NEWENVIRON_CLASS( g_type_class_peek(MUD_TYPE_TELNET_NEWENVIRON) );
+ parent_class = G_OBJECT_CLASS( g_type_class_peek_parent(klass) );
+ obj = parent_class->constructor(gtype, n_properties, properties);
+
+ self = MUD_TELNET_NEWENVIRON(obj);
+
+ if(!self->priv->telnet)
+ {
+ g_printf("ERROR: Tried to instantiate MudTelnetNewEnviron without passing parent MudTelnet\n");
+ g_error("Tried to instantiate MudTelnetNewEnviron without passing parent MudTelnet");
+ }
+
+ self->priv->new_environ_data =
+ g_hash_table_new_full(g_str_hash,
+ g_str_equal,
+ mud_telnet_newenviron_destroy_key,
+ mud_telnet_newenviron_destroy_value);
+
+ return obj;
+}
+
+static void
+mud_telnet_newenviron_finalize (GObject *object)
+{
+ MudTelnetNewEnviron *self;
+ GObjectClass *parent_class;
+
+ self = MUD_TELNET_NEWENVIRON(object);
+
+ if(self->priv->new_environ_data)
+ g_hash_table_destroy(self->priv->new_environ_data);
+
+ parent_class = g_type_class_peek_parent(G_OBJECT_GET_CLASS(object));
+ parent_class->finalize(object);
+}
+
+static void
+mud_telnet_newenviron_set_property(GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ MudTelnetNewEnviron *self;
+
+ self = MUD_TELNET_NEWENVIRON(object);
+
+ switch(prop_id)
+ {
+ case PROP_TELNET:
+ self->priv->telnet = MUD_TELNET(g_value_get_object(value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+mud_telnet_newenviron_get_property(GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ MudTelnetNewEnviron *self;
+
+ self = MUD_TELNET_NEWENVIRON(object);
+
+ switch(prop_id)
+ {
+ case PROP_ENABLED:
+ g_value_set_boolean(value, self->priv->enabled);
+ break;
+
+ case PROP_HANDLES_OPTION:
+ g_value_set_int(value, self->priv->option);
+ break;
+
+ case PROP_TELNET:
+ g_value_take_object(value, self->priv->telnet);
+ break;
+
+ case PROP_ENVIRON:
+ g_value_set_pointer(value, self->priv->new_environ_data);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+ break;
+ }
+}
+
+/* Interface Implementation */
+void
+mud_telnet_newenviron_enable(MudTelnetHandler *handler)
+{
+ MudTelnetNewEnviron *self;
+
+ self = MUD_TELNET_NEWENVIRON(handler);
+
+ g_return_if_fail(MUD_IS_TELNET_NEWENVIRON(self));
+
+ self->priv->enabled = TRUE;
+
+ /* We are only interested in USERVAR */
+ mud_telnet_send_sub_req(self->priv->telnet,
+ 2,
+ TEL_NEWENVIRON_SEND,
+ TEL_NEWENVIRON_USERVAR);
+
+ g_log("Telnet", G_LOG_LEVEL_INFO, "%s", "NEWENVIRON Enabled");
+}
+
+void
+mud_telnet_newenviron_disable(MudTelnetHandler *handler)
+{
+ MudTelnetNewEnviron *self;
+
+ self = MUD_TELNET_NEWENVIRON(handler);
+
+ g_return_if_fail(MUD_IS_TELNET_NEWENVIRON(self));
+
+ self->priv->enabled = FALSE;
+
+ g_log("Telnet", G_LOG_LEVEL_INFO, "%s", "NEWENVIRON Disabled");
+}
+
+void
+mud_telnet_newenviron_handle_sub_neg(MudTelnetHandler *handler,
+ guchar *buf,
+ guint len)
+{
+ MudTelnetNewEnviron *self;
+ guint i, state;
+ GString *key, *value;
+
+ self = MUD_TELNET_NEWENVIRON(handler);
+
+ g_return_if_fail(MUD_IS_TELNET_NEWENVIRON(self));
+
+ /* IAC SB NEW-ENVIRON IS IAC SE is a valid response
+ * when there are no USERVARs. Nothing to parse,
+ * bail out. */
+ if(len == 1)
+ return;
+
+ state = PARSE_STATE_VAR;
+
+ /* The first byte will be either IS or INFO. Since INFO
+ * simply updates variables we do not need to make a
+ * distinction between the two in our case.*/
+ for(i = 1; i < len; ++i)
+ {
+ switch(state)
+ {
+ case PARSE_STATE_VAR:
+ key = g_string_new(NULL);
+
+ state = PARSE_STATE_VAR_STRING;
+ break;
+
+ case PARSE_STATE_VAR_STRING:
+ if( buf[i] != TEL_NEWENVIRON_VALUE )
+ key = g_string_append_c(key, buf[i]);
+ else
+ {
+ if( i + 1 != len)
+ {
+ if( buf[ i + 1] != TEL_NEWENVIRON_VALUE )
+ {
+ /* No VALUE follows USERVAR/VAR. So it
+ * is undefined. */
+ g_string_free(key, TRUE);
+
+ state == PARSE_STATE_VAR;
+ }
+ else
+ {
+ state = PARSE_STATE_VAL;
+ i--;
+ }
+ }
+ }
+ break;
+
+ case PARSE_STATE_VAL:
+ value = g_string_new(NULL);
+
+ state = PARSE_STATE_VAL_STRING;
+ break;
+
+ case PARSE_STATE_VAL_STRING:
+ if( buf[i] != TEL_NEWENVIRON_VAR &&
+ buf[i] != TEL_NEWENVIRON_USERVAR )
+ value = g_string_append_c(value, buf[i]);
+ else
+ {
+ switch( buf[i] )
+ {
+ /* We treat USERVARs and VARs the same. There
+ * shouldn't be any VARs since we don't ask for
+ * them but we'll check anyway. */
+ case TEL_NEWENVIRON_USERVAR:
+ case TEL_NEWENVIRON_VAR:
+ g_hash_table_replace(self->priv->new_environ_data,
+ g_string_free(key, FALSE),
+ g_string_free(value, FALSE));
+
+ state = PARSE_STATE_VAR;
+ i--;
+ break;
+ }
+ }
+
+ if( i + 1 == len) // Last value in subnegotiation.
+ g_hash_table_replace(self->priv->new_environ_data,
+ g_string_free(key, FALSE),
+ g_string_free(value, FALSE));
+
+ break;
+ }
+ }
+
+ /* Log the results */
+ {
+ GList *key_list, *entry;
+
+ g_log("Telnet", G_LOG_LEVEL_MESSAGE, "%s", "NEW-ENVIRON Data:");
+
+ key_list = g_hash_table_get_keys(self->priv->new_environ_data);
+
+ entry = key_list;
+
+ while(entry)
+ {
+ const gchar *keyv = entry->data;
+ const gchar *valv = g_hash_table_lookup(self->priv->new_environ_data, keyv);
+
+ g_log("Telnet",
+ G_LOG_LEVEL_MESSAGE,
+ "\t%s = %s",
+ keyv, (valv) ? valv : "<null>");
+
+ entry = g_list_next(entry);
+ }
+
+ g_list_free(key_list);
+ }
+}
+
+/* Private Methods */
+static void
+mud_telnet_newenviron_destroy_key(gpointer k)
+{
+ gchar *key = (gchar *)k;
+
+ if(key)
+ g_free(key);
+}
+
+static void
+mud_telnet_newenviron_destroy_value(gpointer v)
+{
+ gchar *value = (gchar *)v;
+
+ if(value)
+ g_free(value);
+}
+
Added: trunk/src/mud-telnet-new-environ.h
==============================================================================
--- (empty file)
+++ trunk/src/mud-telnet-new-environ.h Sun Mar 15 00:34:27 2009
@@ -0,0 +1,57 @@
+/* GNOME-Mud - A simple Mud Client
+ * mud-telnet-new-environ.h
+ * Copyright (C) 2005-2009 Les Harris <lharris gnome org>
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef MUD_TELNET_NEWENVIRON_H
+#define MUD_TELNET_NEWENVIRON_H
+
+G_BEGIN_DECLS
+
+#include <glib.h>
+
+#define MUD_TYPE_TELNET_NEWENVIRON (mud_telnet_newenviron_get_type ())
+#define MUD_TELNET_NEWENVIRON(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), MUD_TYPE_TELNET_NEWENVIRON, MudTelnetNewEnviron))
+#define MUD_TELNET_NEWENVIRON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MUD_TYPE_TELNET_NEWENVIRON, MudTelnetNewEnvironClass))
+#define MUD_IS_TELNET_NEWENVIRON(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), MUD_TYPE_TELNET_NEWENVIRON))
+#define MUD_IS_TELNET_NEWENVIRON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MUD_TYPE_TELNET_NEWENVIRON))
+#define MUD_TELNET_NEWENVIRON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MUD_TYPE_TELNET_NEWENVIRON, MudTelnetNewEnvironClass))
+#define MUD_TELNET_NEWENVIRON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUD_TYPE_TELNET_NEWENVIRON, MudTelnetNewEnvironPrivate))
+
+typedef struct _MudTelnetNewEnviron MudTelnetNewEnviron;
+typedef struct _MudTelnetNewEnvironClass MudTelnetNewEnvironClass;
+typedef struct _MudTelnetNewEnvironPrivate MudTelnetNewEnvironPrivate;
+
+struct _MudTelnetNewEnvironClass
+{
+ GObjectClass parent_class;
+};
+
+struct _MudTelnetNewEnviron
+{
+ GObject parent_instance;
+
+ /*< private >*/
+ MudTelnetNewEnvironPrivate *priv;
+};
+
+GType mud_telnet_newenviron_get_type (void);
+
+G_END_DECLS
+
+#endif // MUD_TELNET_NEWENVIRON_H
+
Modified: trunk/src/mud-telnet.c
==============================================================================
--- trunk/src/mud-telnet.c (original)
+++ trunk/src/mud-telnet.c Sun Mar 15 00:34:27 2009
@@ -41,6 +41,7 @@
#include "mud-telnet-charset.h"
#include "mud-telnet-zmp.h"
#include "mud-telnet-mssp.h"
+#include "mud-telnet-new-environ.h"
#ifdef ENABLE_GST
#include "mud-telnet-msp.h"
@@ -802,6 +803,12 @@
g_object_new(MUD_TYPE_TELNET_MSSP,
"telnet", telnet,
NULL));
+ /* NEW-ENVIRON */
+ g_hash_table_replace(telnet->priv->handlers,
+ GINT_TO_POINTER(TELOPT_NEWENVIRON),
+ g_object_new(MUD_TYPE_TELNET_NEWENVIRON,
+ "telnet", telnet,
+ NULL));
#ifdef ENABLE_GST
/* MSP */
g_hash_table_replace(telnet->priv->handlers,
Modified: trunk/src/mud-telnet.h
==============================================================================
--- trunk/src/mud-telnet.h (original)
+++ trunk/src/mud-telnet.h Sun Mar 15 00:34:27 2009
@@ -88,7 +88,16 @@
#define TEL_MSSP_VAR 1
#define TEL_MSSP_VAL 2
-// FIXME: What size should we use?
+/* RFC 1572 - New Environ */
+#define TELOPT_NEWENVIRON 39
+#define TEL_NEWENVIRON_IS 0
+#define TEL_NEWENVIRON_SEND 1
+#define TEL_NEWENVIRON_INFO 2
+#define TEL_NEWENVIRON_VAR 0
+#define TEL_NEWENVIRON_VALUE 1
+#define TEL_NEWENVIRON_ESC 2
+#define TEL_NEWENVIRON_USERVAR 3
+
#define TEL_SUBREQ_BUFFER_SIZE 16318
#define TELOPT_STATE_QUEUE_EMPTY FALSE
#define TELOPT_STATE_QUEUE_OPPOSITE TRUE
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
