io/pn_node.c io/pn_node.h io/pn_node_private.h @@ -97,7 +97,7 @@ objects := msn.o \ ab/pecan_contact.o \ ab/pecan_contactlist.o \ io/pn_stream.o \ - io/pecan_node.o \ + io/pn_node.o \ io/pecan_cmd_server.o \ io/pecan_http_server.o \ io/pecan_ssl_conn.o \ Makefile @@ -30,7 +30,7 @@ MSNSOURCES = msn.c \ ab/pecan_contact.c \ ab/pecan_contactlist.c \ io/pn_stream.c \ - io/pecan_node.c \ + io/pn_node.c \ io/pecan_cmd_server.c \ io/pecan_http_server.c \ io/pecan_ssl_conn.c \ adium/Makefile.am @@ -22,7 +22,7 @@ #include "table_private.h" #include "command_private.h" -#include "io/pecan_node.h" +#include "io/pn_node.h" #include "pn_log.h" @@ -126,10 +126,10 @@ msn_cmdproc_send_trans (MsnCmdProc *cmdproc, { GIOStatus status; - status = pecan_node_write (cmdproc->conn, data, len, NULL, NULL); + status = pn_node_write (cmdproc->conn, data, len, NULL, NULL); if (status != G_IO_STATUS_NORMAL) - pecan_node_error (cmdproc->conn); + pn_node_error (cmdproc->conn); } g_free (data); @@ -170,10 +170,10 @@ msn_cmdproc_send_quick (MsnCmdProc *cmdproc, { GIOStatus status; - status = pecan_node_write (cmdproc->conn, data, len, NULL, NULL); + status = pn_node_write (cmdproc->conn, data, len, NULL, NULL); if (status != G_IO_STATUS_NORMAL) - pecan_node_error (cmdproc->conn); + pn_node_error (cmdproc->conn); } g_free (data); cmd/cmdproc.c @@ -26,7 +26,7 @@ struct MsnSession; struct MsnHistory; -struct PecanNode; +struct PnNode; struct MsnCmdProc { @@ -42,7 +42,7 @@ struct MsnCmdProc guint cmd_count; struct MsnHistory *history; - struct PecanNode *conn; + struct PnNode *conn; }; #endif /* MSN_CMDPROC_PRIVATE_H */ cmd/cmdproc_private.h @@ -25,7 +25,7 @@ #include "cvr/slp.h" #include "cvr/slpmsg.h" -#include "io/pecan_node.h" +#include "io/pn_node.h" #ifndef _WIN32 #include <netinet/in.h> @@ -218,7 +218,7 @@ msn_directconn_write(MsnDirectConn *directconn, } else { - /* pecan_node_error(directconn->conn); */ + /* pn_node_error(directconn->conn); */ msn_directconn_destroy(directconn); } @@ -368,7 +368,7 @@ connect_cb(gpointer data, gint source, const gchar *error_message) { GIOChannel *channel; - /* directconn->conn = pecan_node_new (channel); */ + /* directconn->conn = pn_node_new (channel); */ directconn->connected = TRUE; directconn->stream = pn_stream_new (fd); directconn.c @@ -28,7 +28,7 @@ typedef struct MsnDirectConn MsnDirectConn; #include "cmd/msg.h" #include "io/pn_stream.h" -struct PecanNode; +struct PnNode; struct _PurpleProxyConnectData; struct MsnDirectConn directconn.h @@ -17,7 +17,7 @@ */ #include "pecan_cmd_server.h" -#include "pecan_node_priv.h" +#include "pn_node_private.h" #include "cmd/cmdproc_private.h" #include "cmd/command_private.h" @@ -31,7 +31,7 @@ struct PecanCmdServer { - PecanNode parent; + PnNode parent; gsize payload_len; gchar *rx_buf; @@ -42,14 +42,14 @@ struct PecanCmdServer struct PecanCmdServerClass { - PecanNodeClass parent_class; + PnNodeClass parent_class; }; -static PecanNodeClass *parent_class = NULL; +static PnNodeClass *parent_class = NULL; PecanCmdServer * pecan_cmd_server_new (const gchar *name, - PecanNodeType type) + PnNodeType type) { PecanCmdServer *conn; @@ -58,7 +58,7 @@ pecan_cmd_server_new (const gchar *name, conn = CMD_PECAN_NODE (g_type_create_instance (CMD_PECAN_NODE_TYPE)); { - PecanNode *tmp = PECAN_NODE (conn); + PnNode *tmp = PN_NODE (conn); tmp->name = g_strdup (name); tmp->type = type; } @@ -92,7 +92,7 @@ pecan_cmd_server_send (PecanCmdServer *conn, /** @todo reimplement this in a safer way (GIOChannel) */ /** @todo add extensive tests for this */ static void -parse_impl (PecanNode *base_conn, +parse_impl (PnNode *base_conn, gchar *buf, gsize bytes_read) { @@ -168,7 +168,7 @@ parse_impl (PecanNode *base_conn, } static void -close_impl (PecanNode *conn) +close_impl (PnNode *conn) { PecanCmdServer *cmd_conn; @@ -184,14 +184,14 @@ close_impl (PecanNode *conn) if (cmd_conn->cmdproc) msn_cmdproc_flush (cmd_conn->cmdproc); - PECAN_NODE_CLASS (parent_class)->close (conn); + PN_NODE_CLASS (parent_class)->close (conn); pn_log ("end"); } #if 0 static void -read_impl (PecanNode *conn) +read_impl (PnNode *conn) { MsnBuffer *read_buffer; int r; @@ -216,14 +216,14 @@ read_impl (PecanNode *conn) if (r == 0) { /* connection closed */ - pecan_node_close (conn); + pn_node_close (conn); return; } if (r < 0) { /* connection error */ - pecan_node_close (conn); + pn_node_close (conn); return; } @@ -258,7 +258,7 @@ read_impl (PecanNode *conn) } else { - /* PECAN_NODE_GET_CLASS (conn)->parse (conn); */ + /* PN_NODE_GET_CLASS (conn)->parse (conn); */ } /** @todo only if parsed? yes indeed! */ @@ -308,7 +308,7 @@ static void class_init (gpointer g_class, gpointer class_data) { - PecanNodeClass *conn_class = PECAN_NODE_CLASS (g_class); + PnNodeClass *conn_class = PN_NODE_CLASS (g_class); GObjectClass *gobject_class = G_OBJECT_CLASS (g_class); conn_class->parse = &parse_impl; @@ -345,7 +345,7 @@ pecan_cmd_server_get_type (void) type_info->instance_size = sizeof (PecanCmdServer); type_info->instance_init = instance_init; - type = g_type_register_static (PECAN_NODE_TYPE, "PecanCmdServerType", type_info, 0); + type = g_type_register_static (PN_NODE_TYPE, "PecanCmdServerType", type_info, 0); } return type; io/pecan_cmd_server.c @@ -24,14 +24,14 @@ typedef struct PecanCmdServer PecanCmdServer; typedef struct PecanCmdServerClass PecanCmdServerClass; -#include "pecan_node.h" +#include "pn_node.h" #define CMD_PECAN_NODE_TYPE (pecan_cmd_server_get_type ()) #define CMD_PECAN_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CMD_PECAN_NODE_TYPE, PecanCmdServer)) #define CMD_PECAN_NODE_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), CMD_PECAN_NODE_TYPE, PecanCmdServerClass)) #define CMD_PECAN_NODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CMD_PECAN_NODE_TYPE, PecanCmdServerClass)) -PecanCmdServer *pecan_cmd_server_new (const gchar *name, PecanNodeType type); +PecanCmdServer *pecan_cmd_server_new (const gchar *name, PnNodeType type); void pecan_cmd_server_free (PecanCmdServer *conn); void pecan_cmd_server_send (PecanCmdServer *conn, const char *command, const char *format, ...); io/pecan_cmd_server.h @@ -26,7 +26,7 @@ */ #include "pecan_http_server.h" -#include "pecan_node_priv.h" +#include "pn_node_private.h" #include "pn_stream.h" #include "pn_log.h" #include "pn_global.h" @@ -51,7 +51,7 @@ struct PecanHttpServer { - PecanNode parent; + PnNode parent; gboolean dispose_has_run; guint parser_state; @@ -64,27 +64,27 @@ struct PecanHttpServer gchar *gateway; GHashTable *childs; - PecanNode *cur; + PnNode *cur; gchar *old_buffer; }; struct PecanHttpServerClass { - PecanNodeClass parent_class; + PnNodeClass parent_class; }; -static PecanNodeClass *parent_class = NULL; +static PnNodeClass *parent_class = NULL; typedef struct { - PecanNode *conn; + PnNode *conn; gchar *body; gsize body_len; } HttpQueueData; static GIOStatus -foo_write (PecanNode *conn, - PecanNode *prev, +foo_write (PnNode *conn, + PnNode *prev, const gchar *buf, gsize count, gsize *ret_bytes_written, @@ -100,7 +100,7 @@ process_queue (PecanHttpServer *http_conn, if (queue_data) { - foo_write (PECAN_NODE (http_conn), + foo_write (PN_NODE (http_conn), queue_data->conn, queue_data->body, queue_data->body_len, @@ -117,13 +117,13 @@ read_cb (GIOChannel *source, GIOCondition condition, gpointer data) { - PecanNode *conn; + PnNode *conn; gchar buf[PN_BUF_LEN + 1]; gsize bytes_read; pn_log ("begin"); - conn = PECAN_NODE (data); + conn = PN_NODE (data); pn_debug ("conn=%p,source=%p", conn, source); @@ -132,7 +132,7 @@ read_cb (GIOChannel *source, { GIOStatus status = G_IO_STATUS_NORMAL; - status = pecan_node_read (conn, buf, PN_BUF_LEN, &bytes_read, &conn->error); + status = pn_node_read (conn, buf, PN_BUF_LEN, &bytes_read, &conn->error); if (status == G_IO_STATUS_AGAIN) { @@ -142,7 +142,7 @@ read_cb (GIOChannel *source, if (conn->error) { - pecan_node_error (conn); + pn_node_error (conn); g_object_unref (conn); return FALSE; } @@ -168,7 +168,7 @@ read_cb (GIOChannel *source, if (!(http_conn->old_buffer && strncmp (buf, http_conn->old_buffer, bytes_read) == 0)) { - pecan_node_parse (http_conn->cur, buf, bytes_read); + pn_node_parse (http_conn->cur, buf, bytes_read); g_free (http_conn->old_buffer); http_conn->old_buffer = g_strndup (buf, bytes_read); @@ -181,7 +181,7 @@ read_cb (GIOChannel *source, if (conn->error) { - pecan_node_error (conn); + pn_node_error (conn); g_object_unref (conn); return FALSE; } @@ -204,9 +204,9 @@ pecan_http_server_new (const gchar *name) http_conn = PECAN_HTTP_SERVER (g_type_create_instance (PECAN_HTTP_SERVER_TYPE)); { - PecanNode *tmp = PECAN_NODE (http_conn); + PnNode *tmp = PN_NODE (http_conn); tmp->name = g_strdup (name); - tmp->type = PECAN_NODE_HTTP; + tmp->type = PN_NODE_HTTP; } pn_log ("end"); @@ -225,7 +225,7 @@ pecan_http_server_free (PecanHttpServer *http_conn) static gboolean http_poll (gpointer data) { - PecanNode *conn; + PnNode *conn; PecanHttpServer *http_conn; GIOStatus status = G_IO_STATUS_NORMAL; GError *tmp_error = NULL; @@ -238,7 +238,7 @@ http_poll (gpointer data) g_return_val_if_fail (data != NULL, FALSE); - conn = PECAN_NODE (data); + conn = PN_NODE (data); http_conn = PECAN_HTTP_SERVER (data); pn_debug ("stream=%p", conn->stream); @@ -301,9 +301,9 @@ http_poll (gpointer data) if (status != G_IO_STATUS_NORMAL) { - PecanNodeClass *class; + PnNodeClass *class; pn_error ("not normal: status=%d", status); - class = g_type_class_peek (PECAN_NODE_TYPE); + class = g_type_class_peek (PN_NODE_TYPE); g_signal_emit (G_OBJECT (conn), class->error_sig, 0, conn); return FALSE; } @@ -316,12 +316,12 @@ connect_cb (gpointer data, gint source, const gchar *error_message) { - PecanNode *conn; + PnNode *conn; PecanHttpServer *http_conn; pn_log ("begin"); - conn = PECAN_NODE (data); + conn = PN_NODE (data); http_conn = PECAN_HTTP_SERVER (data); conn->connect_data = NULL; @@ -341,17 +341,17 @@ connect_cb (gpointer data, conn->read_watch = g_io_add_watch (channel, G_IO_IN, read_cb, conn); { - PecanNodeClass *class; - class = g_type_class_peek (PECAN_NODE_TYPE); + PnNodeClass *class; + class = g_type_class_peek (PN_NODE_TYPE); g_signal_emit (G_OBJECT (conn), class->open_sig, 0, conn); } } else { - PecanNodeClass *class; - class = g_type_class_peek (PECAN_NODE_TYPE); + PnNodeClass *class; + class = g_type_class_peek (PN_NODE_TYPE); - conn->error = g_error_new_literal (PECAN_NODE_ERROR, PECAN_NODE_ERROR_OPEN, + conn->error = g_error_new_literal (PN_NODE_ERROR, PN_NODE_ERROR_OPEN, error_message ? error_message : "Unable to connect"); g_signal_emit (G_OBJECT (conn), class->error_sig, 0, conn); @@ -361,7 +361,7 @@ connect_cb (gpointer data, } static void -connect_impl (PecanNode *conn, +connect_impl (PnNode *conn, const gchar *hostname, gint port) { @@ -381,7 +381,7 @@ connect_impl (PecanNode *conn, purple_proxy_connect_cancel (conn->connect_data); } - if (conn->prev->type == PECAN_NODE_NS) + if (conn->prev->type == PN_NODE_NS) hostname = http_conn->gateway; port = 80; pn_debug ("conn=%p,hostname=%s,port=%d", conn, hostname, port); @@ -394,15 +394,15 @@ connect_impl (PecanNode *conn, if (conn->prev) { /* fake open */ - PecanNodeClass *class; - class = g_type_class_peek (PECAN_NODE_TYPE); + PnNodeClass *class; + class = g_type_class_peek (PN_NODE_TYPE); g_signal_emit (G_OBJECT (conn->prev), class->open_sig, 0, conn->prev); } } } static void -close_impl (PecanNode *conn) +close_impl (PnNode *conn) { PecanHttpServer *http_conn; @@ -440,13 +440,13 @@ close_impl (PecanNode *conn) g_hash_table_remove_all (http_conn->childs); #endif - PECAN_NODE_CLASS (parent_class)->close (conn); + PN_NODE_CLASS (parent_class)->close (conn); pn_log ("end"); } static GIOStatus -read_impl (PecanNode *conn, +read_impl (PnNode *conn, gchar *buf, gsize count, gsize *ret_bytes_read, @@ -499,7 +499,7 @@ read_impl (PecanNode *conn, (strcmp (tokens[0], "HTTP/1.0") == 0)))) { pn_debug ("error reading: parse error"); - tmp_error = g_error_new_literal (PECAN_NODE_ERROR, PECAN_NODE_ERROR_OPEN, + tmp_error = g_error_new_literal (PN_NODE_ERROR, PN_NODE_ERROR_OPEN, "Parse error"); goto leave; } @@ -507,7 +507,7 @@ read_impl (PecanNode *conn, if (!(tokens[1])) { pn_debug ("error reading: parse error"); - tmp_error = g_error_new_literal (PECAN_NODE_ERROR, PECAN_NODE_ERROR_OPEN, + tmp_error = g_error_new_literal (PN_NODE_ERROR, PN_NODE_ERROR_OPEN, "Parse error"); goto leave; } @@ -517,7 +517,7 @@ read_impl (PecanNode *conn, if (code != 200 && code != 100) { pn_debug ("error reading: %d %s", code, tokens[2]); - tmp_error = g_error_new (PECAN_NODE_ERROR, PECAN_NODE_ERROR_OPEN, + tmp_error = g_error_new (PN_NODE_ERROR, PN_NODE_ERROR_OPEN, "%s", tokens[2]); goto leave; } @@ -563,7 +563,7 @@ read_impl (PecanNode *conn, if (!(tokens[0] && tokens[1])) { pn_debug ("error reading: parse error"); - tmp_error = g_error_new_literal (PECAN_NODE_ERROR, PECAN_NODE_ERROR_OPEN, + tmp_error = g_error_new_literal (PN_NODE_ERROR, PN_NODE_ERROR_OPEN, "Parse error"); goto leave; } @@ -629,7 +629,7 @@ read_impl (PecanNode *conn, if (http_conn->parser_state == 2) { { - PecanNode *child; + PnNode *child; gchar *session_id; gchar *t; @@ -644,16 +644,16 @@ read_impl (PecanNode *conn, { if (child) { - PecanNode *foo; + PnNode *foo; pn_info ("removing child"); - pecan_node_close (child); + pn_node_close (child); g_hash_table_remove (http_conn->childs, session_id); g_object_unref (G_OBJECT (http_conn->cur)); g_free (http_conn->gateway); g_free (http_conn->last_session_id); - if ((foo = PECAN_NODE (g_hash_table_peek_first (http_conn->childs)))) + if ((foo = PN_NODE (g_hash_table_peek_first (http_conn->childs)))) { http_conn->cur = foo; http_conn->gateway = g_strdup (foo->hostname); @@ -665,7 +665,7 @@ read_impl (PecanNode *conn, http_conn->cur = NULL; http_conn->gateway = NULL; http_conn->last_session_id = NULL; - pecan_node_close (conn); + pn_node_close (conn); } } } @@ -729,8 +729,8 @@ reset_timer (PecanHttpServer *http_conn) } static GIOStatus -foo_write (PecanNode *conn, - PecanNode *prev, +foo_write (PnNode *conn, + PnNode *prev, const gchar *buf, gsize count, gsize *ret_bytes_written, @@ -763,7 +763,7 @@ foo_write (PecanNode *conn, else { params = g_strdup_printf ("Action=open&Server=%s&IP=%s", - prev->type == PECAN_NODE_NS ? "NS" : "SB", + prev->type == PN_NODE_NS ? "NS" : "SB", prev->hostname); } @@ -854,18 +854,18 @@ foo_write (PecanNode *conn, } static GIOStatus -write_impl (PecanNode *conn, +write_impl (PnNode *conn, const gchar *buf, gsize count, gsize *ret_bytes_written, GError **error) { PecanHttpServer *http_conn; - PecanNode *prev; + PnNode *prev; GIOStatus status = G_IO_STATUS_NORMAL; http_conn = PECAN_HTTP_SERVER (conn); - prev = PECAN_NODE (conn->prev); + prev = PN_NODE (conn->prev); pn_debug ("stream=%p", conn->stream); pn_debug ("conn=%p,prev=%p", conn, prev); @@ -928,7 +928,7 @@ static void class_init (gpointer g_class, gpointer class_data) { - PecanNodeClass *conn_class = PECAN_NODE_CLASS (g_class); + PnNodeClass *conn_class = PN_NODE_CLASS (g_class); GObjectClass *gobject_class = G_OBJECT_CLASS (g_class); conn_class->connect = &connect_impl; @@ -968,7 +968,7 @@ pecan_http_server_get_type (void) type_info->instance_size = sizeof (PecanHttpServer); type_info->instance_init = instance_init; - type = g_type_register_static (PECAN_NODE_TYPE, "PecanHttpServerType", type_info, 0); + type = g_type_register_static (PN_NODE_TYPE, "PecanHttpServerType", type_info, 0); } return type; io/pecan_http_server.c @@ -24,7 +24,7 @@ typedef struct PecanHttpServer PecanHttpServer; typedef struct PecanHttpServerClass PecanHttpServerClass; -#include "pecan_node.h" +#include "pn_node.h" #define PECAN_HTTP_SERVER_TYPE (pecan_http_server_get_type ()) #define PECAN_HTTP_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PECAN_HTTP_SERVER_TYPE, PecanHttpServer)) io/pecan_http_server.h @@ -19,7 +19,7 @@ #include <glib.h> #include "io/pecan_parser.h" -#include "io/pecan_node.h" +#include "io/pn_node.h" #include "pn_log.h" @@ -27,14 +27,14 @@ struct PecanParser { - PecanNode *node; + PnNode *node; gchar *rx_buf; gsize rx_len; gboolean need_more; }; PecanParser * -pecan_parser_new (PecanNode *node) +pecan_parser_new (PnNode *node) { PecanParser *parser; parser = g_new0 (PecanParser, 1); @@ -71,7 +71,7 @@ pecan_parser_read_line (PecanParser *parser, gchar buf[0x2000 + 1]; gsize bytes_read; - status = pecan_node_read (parser->node, buf, 0x2000, &bytes_read, NULL); + status = pn_node_read (parser->node, buf, 0x2000, &bytes_read, NULL); if (status != G_IO_STATUS_NORMAL) goto leave; io/pecan_parser.c @@ -21,9 +21,9 @@ typedef struct PecanParser PecanParser; -#include "io/pecan_node.h" +#include "io/pn_node.h" -PecanParser *pecan_parser_new (PecanNode *node); +PecanParser *pecan_parser_new (PnNode *node); void pecan_parser_free (PecanParser *parser); GIOStatus pecan_parser_read_line (PecanParser *parser, gchar **str_return, io/pecan_parser.h @@ -17,7 +17,7 @@ */ #include "pecan_ssl_conn.h" -#include "pecan_node_priv.h" +#include "pn_node_private.h" #include "pn_log.h" #include "session.h" /* for libpurple account */ @@ -36,7 +36,7 @@ struct PecanSslConn { - PecanNode parent; + PnNode parent; struct _PurpleSslConnection *ssl_data; PecanSslConnReadCb read_cb; @@ -45,7 +45,7 @@ struct PecanSslConn struct PecanSslConnClass { - PecanNodeClass parent_class; + PnNodeClass parent_class; }; static GObjectClass *parent_class = NULL; @@ -55,12 +55,12 @@ read_cb (gpointer data, PurpleSslConnection *gsc, PurpleInputCondition cond) { - PecanNode *conn; + PnNode *conn; PecanSslConn *ssl_conn; pn_log ("begin"); - conn = PECAN_NODE (data); + conn = PN_NODE (data); ssl_conn = PECAN_SSL_CONN (data); pn_debug ("conn=%p,name=%s", conn, conn->name); @@ -82,7 +82,7 @@ read_cb (gpointer data, { GIOStatus status = G_IO_STATUS_NORMAL; - status = pecan_node_read (conn, buf, MSN_BUF_LEN, &bytes_read, NULL); + status = pn_node_read (conn, buf, MSN_BUF_LEN, &bytes_read, NULL); if (status == G_IO_STATUS_AGAIN) { @@ -92,19 +92,19 @@ read_cb (gpointer data, if (status == G_IO_STATUS_EOF) { - conn->error = g_error_new (PECAN_NODE_ERROR, PECAN_NODE_ERROR_OPEN, "End of stream"); + conn->error = g_error_new (PN_NODE_ERROR, PN_NODE_ERROR_OPEN, "End of stream"); } if (conn->error) { - pecan_node_error (conn); + pn_node_error (conn); g_object_unref (conn); purple_ssl_close (gsc); return; } } - pecan_node_parse (conn, buf, bytes_read); + pn_node_parse (conn, buf, bytes_read); g_object_unref (conn); } @@ -116,15 +116,15 @@ leave: PecanSslConn * pecan_ssl_conn_new (gchar *name, - PecanNodeType type) + PnNodeType type) { PecanSslConn *ssl_conn; - PecanNode *conn; + PnNode *conn; pn_log ("begin"); ssl_conn = PECAN_SSL_CONN (g_type_create_instance (PECAN_SSL_CONN_TYPE)); - conn = PECAN_NODE (ssl_conn); + conn = PN_NODE (ssl_conn); conn->name = g_strdup (name); conn->type = type; @@ -153,19 +153,19 @@ pecan_ssl_conn_set_read_cb (PecanSslConn *ssl_conn, ssl_conn->read_cb_data = data; } -/* PecanNode stuff. */ +/* PnNode stuff. */ static void connect_cb (gpointer data, PurpleSslConnection *gsc, PurpleInputCondition cond) { - PecanNode *conn; + PnNode *conn; PecanSslConn *ssl_conn; pn_log ("begin"); - conn = PECAN_NODE (data); + conn = PN_NODE (data); ssl_conn = PECAN_SSL_CONN (data); g_object_ref (conn); @@ -178,14 +178,14 @@ connect_cb (gpointer data, else { /* pn_error ("connection error: conn=%p,msg=[%s]", conn, error_message); */ - conn->error = g_error_new_literal (PECAN_NODE_ERROR, PECAN_NODE_ERROR_OPEN, + conn->error = g_error_new_literal (PN_NODE_ERROR, PN_NODE_ERROR_OPEN, "Unable to connect"); - pecan_node_error (conn); + pn_node_error (conn); } { - PecanNodeClass *class; - class = g_type_class_peek (PECAN_NODE_TYPE); + PnNodeClass *class; + class = g_type_class_peek (PN_NODE_TYPE); g_signal_emit (G_OBJECT (conn), class->open_sig, 0, conn); } @@ -195,7 +195,7 @@ connect_cb (gpointer data, } static void -connect_impl (PecanNode *conn, +connect_impl (PnNode *conn, const gchar *hostname, gint port) { @@ -213,7 +213,7 @@ connect_impl (PecanNode *conn, conn->hostname = g_strdup (hostname); conn->port = port; - pecan_node_close (conn); + pn_node_close (conn); #ifdef HAVE_LIBPURPLE ssl_conn->ssl_data = purple_ssl_connect (msn_session_get_user_data (conn->session), @@ -224,7 +224,7 @@ connect_impl (PecanNode *conn, } static void -close_impl (PecanNode *conn) +close_impl (PnNode *conn) { PecanSslConn *ssl_conn; @@ -282,7 +282,7 @@ status_to_str (GIOStatus status) } static GIOStatus -write_impl (PecanNode *conn, +write_impl (PnNode *conn, const gchar *buf, gsize count, gsize *ret_bytes_written, @@ -342,7 +342,7 @@ write_impl (PecanNode *conn, } static GIOStatus -read_impl (PecanNode *conn, +read_impl (PnNode *conn, gchar *buf, gsize count, gsize *ret_bytes_read, @@ -394,7 +394,7 @@ read_impl (PecanNode *conn, static void dispose (GObject *obj) { - PecanNode *conn = PECAN_NODE (obj); + PnNode *conn = PN_NODE (obj); pn_log ("begin"); @@ -402,7 +402,7 @@ dispose (GObject *obj) { conn->dispose_has_run = TRUE; - pecan_node_close (conn); + pn_node_close (conn); g_free (conn->name); } @@ -422,7 +422,7 @@ static void class_init (gpointer g_class, gpointer class_data) { - PecanNodeClass *conn_class = PECAN_NODE_CLASS (g_class); + PnNodeClass *conn_class = PN_NODE_CLASS (g_class); GObjectClass *gobject_class = G_OBJECT_CLASS (g_class); conn_class->connect = &connect_impl; @@ -450,7 +450,7 @@ pecan_ssl_conn_get_type (void) type_info->class_init = class_init; type_info->instance_size = sizeof (PecanSslConn); - type = g_type_register_static (PECAN_NODE_TYPE, "PecanSslConnType", type_info, 0); + type = g_type_register_static (PN_NODE_TYPE, "PecanSslConnType", type_info, 0); g_free (type_info); } io/pecan_ssl_conn.c @@ -21,19 +21,19 @@ #include <glib-object.h> -#include "io/pecan_node.h" +#include "io/pn_node.h" typedef struct PecanSslConn PecanSslConn; typedef struct PecanSslConnClass PecanSslConnClass; -typedef void (*PecanSslConnReadCb) (PecanNode *conn, gpointer data); +typedef void (*PecanSslConnReadCb) (PnNode *conn, gpointer data); #define PECAN_SSL_CONN_TYPE (pecan_ssl_conn_get_type ()) #define PECAN_SSL_CONN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PECAN_SSL_CONN_TYPE, PecanSslConn)) #define PECAN_SSL_CONN_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), PECAN_SSL_CONN_TYPE, PecanSslConnClass)) #define PECAN_SSL_CONN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PECAN_SSL_CONN_TYPE, PecanSslConnClass)) -PecanSslConn *pecan_ssl_conn_new (gchar *name, PecanNodeType type); +PecanSslConn *pecan_ssl_conn_new (gchar *name, PnNodeType type); void pecan_ssl_conn_free (PecanSslConn *ssl_conn); /** @todo this thing should be on the main class */ void pecan_ssl_conn_set_read_cb (PecanSslConn *ssl_conn, PecanSslConnReadCb read_cb, gpointer data); io/pecan_ssl_conn.h @@ -39,7 +39,7 @@ #include "io/pecan_cmd_server.h" #include "io/pecan_http_server.h" -#include "io/pecan_node_priv.h" +#include "io/pn_node_private.h" #include "io/pecan_cmd_server.h" #if defined(PECAN_CVR) @@ -67,7 +67,7 @@ typedef struct } MsnAddBuddy; static void -open_cb (PecanNode *conn, +open_cb (PnNode *conn, MsnNotification *notification) { MsnSession *session; @@ -84,7 +84,7 @@ open_cb (PecanNode *conn, } static void -close_cb (PecanNode *conn, +close_cb (PnNode *conn, MsnNotification *notification) { char *tmp; @@ -108,7 +108,7 @@ close_cb (PecanNode *conn, } } - pecan_node_close (PECAN_NODE (notification->conn)); + pn_node_close (PN_NODE (notification->conn)); notification->closed = TRUE; msn_session_set_error (notification->session, MSN_ERROR_SERVCONN, tmp); @@ -163,9 +163,9 @@ msn_notification_new(MsnSession *session) notification->session = session; { - PecanNode *conn; - notification->conn = pecan_cmd_server_new ("notification server", PECAN_NODE_NS); - conn = PECAN_NODE (notification->conn); + PnNode *conn; + notification->conn = pecan_cmd_server_new ("notification server", PN_NODE_NS); + conn = PN_NODE (notification->conn); { MsnCmdProc *cmdproc; @@ -186,16 +186,16 @@ msn_notification_new(MsnSession *session) if (session->http_conn) { /* A single http connection shared by all nodes */ - pecan_node_link (conn, session->http_conn); + pn_node_link (conn, session->http_conn); } else { /* Each node has it's own http connection. */ - PecanNode *foo; + PnNode *foo; - foo = PECAN_NODE (pecan_http_server_new ("foo server")); + foo = PN_NODE (pecan_http_server_new ("foo server")); foo->session = session; - pecan_node_link (conn, foo); + pn_node_link (conn, foo); g_object_unref (foo); } } @@ -232,7 +232,7 @@ msn_notification_connect(MsnNotification *notification, const char *host, int po { g_return_val_if_fail(notification != NULL, FALSE); - pecan_node_connect (PECAN_NODE (notification->conn), host, port); + pn_node_connect (PN_NODE (notification->conn), host, port); return TRUE; } @@ -421,7 +421,7 @@ msn_notification_close(MsnNotification *notification) if (!notification->closed) { msn_cmdproc_send_quick (notification->cmdproc, "OUT", NULL, NULL); - pecan_node_close (PECAN_NODE (notification->conn)); + pn_node_close (PN_NODE (notification->conn)); } } notification.c @@ -25,7 +25,7 @@ typedef struct MsnNotification MsnNotification; #include "io/pecan_cmd_server.h" -#include "io/pecan_node.h" +#include "io/pn_node.h" struct MsnSession; struct MsnCmdProc; notification.h @@ -22,7 +22,7 @@ #include "io/pecan_ssl_conn.h" #include "io/pecan_parser.h" -#include "io/pecan_node_priv.h" +#include "io/pn_node_private.h" #include "session_private.h" #include <string.h> /* for strlen */ #include <stdlib.h> /* for atoi */ @@ -55,7 +55,7 @@ struct OimRequest gsize payload; gulong open_sig_handler; - PecanNode *conn; + PnNode *conn; }; static inline OimRequest * @@ -79,7 +79,7 @@ oim_request_free (OimRequest *oim_request) if (oim_request->open_sig_handler) g_signal_handler_disconnect (oim_request->conn, oim_request->open_sig_handler); - pecan_node_free (oim_request->conn); + pn_node_free (oim_request->conn); pecan_parser_free (oim_request->parser); g_free (oim_request->passport); g_free (oim_request->message_id); @@ -117,7 +117,7 @@ pn_oim_session_free (PecanOimSession *oim_session) } static inline void -oim_send_request (PecanNode *conn, +oim_send_request (PnNode *conn, OimRequest *oim_request) { gchar *body; @@ -171,7 +171,7 @@ oim_send_request (PecanNode *conn, { gsize len; - pecan_node_write (conn, header, strlen (header), &len, NULL); + pn_node_write (conn, header, strlen (header), &len, NULL); pn_debug ("write_len=%d", len); } @@ -181,7 +181,7 @@ oim_send_request (PecanNode *conn, } static void -open_cb (PecanNode *conn, +open_cb (PnNode *conn, OimRequest *oim_request) { g_return_if_fail (conn); @@ -208,7 +208,7 @@ next_request (PecanOimSession *oim_session) } static void -read_cb (PecanNode *conn, +read_cb (PnNode *conn, gpointer data) { OimRequest *oim_request; @@ -291,7 +291,7 @@ read_cb (PecanNode *conn, } leave: - pecan_node_close (conn); + pn_node_close (conn); next_request (oim_request->oim_session); } @@ -307,17 +307,17 @@ oim_process_requests (PecanOimSession *oim_session) { PecanSslConn *ssl_conn; - PecanNode *conn; + PnNode *conn; - ssl_conn = pecan_ssl_conn_new ("oim", PECAN_NODE_NULL); + ssl_conn = pecan_ssl_conn_new ("oim", PN_NODE_NULL); - conn = PECAN_NODE (ssl_conn); + conn = PN_NODE (ssl_conn); conn->session = oim_session->session; oim_request->parser = pecan_parser_new (conn); pecan_ssl_conn_set_read_cb (ssl_conn, read_cb, oim_request); - pecan_node_connect (conn, "rsi.hotmail.com", 443); + pn_node_connect (conn, "rsi.hotmail.com", 443); oim_request->conn = conn; oim_request->open_sig_handler = g_signal_connect (conn, "open", G_CALLBACK (open_cb), oim_request); pn_oim.c @@ -87,8 +87,8 @@ msn_session_new (const gchar *username, #if 0 if (session->http_method) { - PecanNode *foo; - foo = PECAN_NODE (pecan_http_server_new ("foo server")); + PnNode *foo; + foo = PN_NODE (pecan_http_server_new ("foo server")); foo->session = session; session->http_conn = foo; } @@ -244,7 +244,7 @@ msn_session_disconnect (MsnSession *session) msn_notification_close (session->notification); if (session->http_conn) - pecan_node_close (session->http_conn); + pn_node_close (session->http_conn); } /* TODO: This must go away when conversation is redesigned */ session.c @@ -21,12 +21,11 @@ #define SESSION_PRIVATE_H #include "session.h" -#include "io/pecan_node.h" #include "ab/pecan_contact.h" #include "ab/pecan_contactlist.h" -#include "io/pecan_node.h" +#include "io/pn_node.h" #include "pn_oim.h" #include "pn_dp_manager.h" @@ -52,7 +51,7 @@ struct MsnSession gboolean connected; gboolean logged_in; /** @todo move to libpurple user_data and cancel operations that require us to be logged in. */ - PecanNode *http_conn; + PnNode *http_conn; struct MsnNotification *notification; struct MsnNexus *nexus; session_private.h @@ -42,7 +42,7 @@ #include "cmd/command_private.h" #include "cmd/table.h" -#include "io/pecan_node_priv.h" +#include "io/pn_node_private.h" #include "io/pecan_cmd_server.h" #include "io/pecan_http_server.h" @@ -65,7 +65,7 @@ static void msn_switchboard_report_user(MsnSwitchBoard *swboard, PurpleMessageFlags flags, const char *msg); static void -open_cb (PecanNode *conn, +open_cb (PnNode *conn, MsnSwitchBoard *swboard) { MsnSession *session; @@ -101,7 +101,7 @@ open_cb (PecanNode *conn, } static void -close_cb (PecanNode *conn, +close_cb (PnNode *conn, MsnSwitchBoard *swboard) { g_return_if_fail (swboard); @@ -145,9 +145,9 @@ msn_switchboard_new(MsnSession *session) swboard->empty = TRUE; { - PecanNode *conn; - swboard->conn = pecan_cmd_server_new ("switchboard server", PECAN_NODE_SB); - conn = PECAN_NODE (swboard->conn); + PnNode *conn; + swboard->conn = pecan_cmd_server_new ("switchboard server", PN_NODE_SB); + conn = PN_NODE (swboard->conn); { MsnCmdProc *cmdproc; @@ -167,16 +167,16 @@ msn_switchboard_new(MsnSession *session) if (session->http_conn) { /* A single http connection shared by all nodes */ - pecan_node_link (conn, session->http_conn); + pn_node_link (conn, session->http_conn); } else { /* Each node has it's own http connection. */ - PecanNode *foo; + PnNode *foo; - foo = PECAN_NODE (pecan_http_server_new ("foo server")); + foo = PN_NODE (pecan_http_server_new ("foo server")); foo->session = session; - pecan_node_link (conn, foo); + pn_node_link (conn, foo); g_object_unref (foo); } } @@ -253,9 +253,9 @@ msn_switchboard_free (MsnSwitchBoard *swboard) /* make sure all the transactions are destroyed so no timeouts occur after * the switchboard is destroyed; the node can still be refed by someone * else. */ - pecan_node_close (PECAN_NODE (swboard->conn)); + pn_node_close (PN_NODE (swboard->conn)); - pecan_node_free (PECAN_NODE (swboard->conn)); + pn_node_free (PN_NODE (swboard->conn)); g_free(swboard); @@ -1440,7 +1440,7 @@ msn_switchboard_connect(MsnSwitchBoard *swboard, const char *host, int port) { g_return_val_if_fail (swboard, FALSE); - pecan_node_connect (PECAN_NODE (swboard->conn), host, port); + pn_node_connect (PN_NODE (swboard->conn), host, port); return TRUE; } switchboard.c @@ -51,7 +51,7 @@ typedef enum } MsnSBFlag; #include "io/pecan_cmd_server.h" -#include "io/pecan_node.h" +#include "io/pn_node.h" struct MsnSession; struct MsnMessage; switchboard.h @@ -10,7 +10,7 @@ CFLAGS := -Wall -ggdb -I.. cmd_parser_test_objects := cmd_parser.o \ ../io/pecan_cmd_server.o \ - ../io/pecan_node.o \ + ../io/pn_node.o \ ../cmd/cmdproc.o \ ../cmd/command.o \ ../cmd/history.o \ @@ -47,7 +47,7 @@ check_buffer: LIBS := $(GOBJECT_LIBS) $(CHECK_LIBS) checks += check_buffer -check_parser: parser.o ../io/pecan_parser.o ../io/pecan_node.o ../io/pn_stream.o ../pn_log.o ../pn_printf.o +check_parser: parser.o ../io/pecan_parser.o ../io/pn_node.o ../io/pn_stream.o ../pn_log.o ../pn_printf.o check_parser: CFLAGS := $(CFLAGS) $(GOBJECT_CFLAGS) $(CHECK_CFLAGS) check_parser: LIBS := $(GOBJECT_LIBS) $(CHECK_LIBS) tests/Makefile @@ -34,7 +34,7 @@ run_simple_test (const gchar *str, strcpy (buf, str); cmdserv = pecan_cmd_server_new ("foo", 0); - pecan_node_parse (PECAN_NODE (cmdserv), buf, buf_size - 1); + pn_node_parse (PN_NODE (cmdserv), buf, buf_size - 1); pecan_cmd_server_free (cmdserv); g_free (buf); tests/cmd_parser.c @@ -24,27 +24,27 @@ #include <fcntl.h> #include "io/pecan_parser.h" -#include "io/pecan_node_priv.h" +#include "io/pn_node_private.h" #include "io/pn_stream.h" START_TEST (test_basic) { - PecanNode *node; + PnNode *node; - node = pecan_node_new ("foo", 0); - pecan_node_free (node); + node = pn_node_new ("foo", 0); + pn_node_free (node); } END_TEST START_TEST (test_simple) { - PecanNode *node; + PnNode *node; PecanParser *parser; gchar *str; gsize terminator_pos; gint fd; - node = pecan_node_new ("foo", 0); + node = pn_node_new ("foo", 0); parser = pecan_parser_new (node); fd = g_open ("stream_test/000", O_RDONLY); @@ -57,19 +57,19 @@ START_TEST (test_simple) } pecan_parser_free (parser); - pecan_node_free (node); + pn_node_free (node); } END_TEST START_TEST (test_through) { - PecanNode *node; + PnNode *node; PecanParser *parser; gchar *str; gsize terminator_pos; gint fd; - node = pecan_node_new ("foo", 0); + node = pn_node_new ("foo", 0); parser = pecan_parser_new (node); fd = g_open ("stream_test/000", O_RDONLY); @@ -89,19 +89,19 @@ START_TEST (test_through) } pecan_parser_free (parser); - pecan_node_free (node); + pn_node_free (node); } END_TEST START_TEST (test_cut) { - PecanNode *node; + PnNode *node; PecanParser *parser; gchar *str; gsize terminator_pos; gint fd; - node = pecan_node_new ("foo", 0); + node = pn_node_new ("foo", 0); parser = pecan_parser_new (node); fd = g_open ("stream_test/001", O_RDONLY); @@ -121,19 +121,19 @@ START_TEST (test_cut) } pecan_parser_free (parser); - pecan_node_free (node); + pn_node_free (node); } END_TEST START_TEST (test_span) { - PecanNode *node; + PnNode *node; PecanParser *parser; gchar *str; gsize terminator_pos; gint fd; - node = pecan_node_new ("foo", 0); + node = pn_node_new ("foo", 0); parser = pecan_parser_new (node); fd = g_open ("stream_test/001", O_RDONLY); @@ -168,7 +168,7 @@ START_TEST (test_span) } pecan_parser_free (parser); - pecan_node_free (node); + pn_node_free (node); } END_TEST tests/parser.c io/pecan_node.c io/pecan_node.h io/pecan_node_priv.h 8d2b3d394054649a586051ddd09d93074ed6e5ed Felipe Contreras felipe.contreras@gmail.com http://github.com/felipec/msn-pecan/commit/0e27f129badb5089fdd1a7b9ccaec22d287e0d92 0e27f129badb5089fdd1a7b9ccaec22d287e0d92 2009-07-04T15:36:07-07:00 2009-06-20T03:18:50-07:00 Rename pn_node Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> 7e766b71c8a47e12efdd6eae948cf69fcc6b82db Felipe Contreras felipe.contreras@gmail.com