Merge pull request #854 from irssi/ahf/otr

OTR support, take 2

3 files changed, 35 insertions, 35 deletions

diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index d6e767b6..94c53e74 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -35,41 +35,6 @@ typedef struct {
 	int tag;
 } SIMPLE_THREAD_REC;
 
-static int g_io_channel_write_block(GIOChannel *channel, void *data, int len)
-{
-        gsize ret;
-	int sent;
-	GIOStatus status;
-
-	sent = 0;
-	do {
-		status = g_io_channel_write_chars(channel, (char *) data + sent,
-						  len-sent, &ret, NULL);
-                sent += ret;
-	} while (sent < len && status != G_IO_STATUS_ERROR);
-
-	return sent < len ? -1 : 0;
-}
-
-static int g_io_channel_read_block(GIOChannel *channel, void *data, int len)
-{
-	time_t maxwait;
-        gsize ret;
-	int received;
-	GIOStatus status;
-
-	maxwait = time(NULL)+2;
-	received = 0;
-	do {
-		status = g_io_channel_read_chars(channel, (char *) data + received,
-						 len-received, &ret, NULL);
-		received += ret;
-	} while (received < len && time(NULL) < maxwait &&
-		 status != G_IO_STATUS_ERROR && status != G_IO_STATUS_EOF);
-
-	return received < len ? -1 : 0;
-}
-
 /* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
    written to pipe when found PID of the resolver child is returned */
 int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
diff --git a/src/core/network.c b/src/core/network.c
index d280b463..0e326e22 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -48,6 +48,39 @@ GIOChannel *g_io_channel_new(int handle)
 	return chan;
 }
 
+int g_io_channel_write_block(GIOChannel *channel, void *data, int len)
+{
+	gsize ret;
+	int sent;
+	GIOStatus status;
+
+	sent = 0;
+	do {
+		status = g_io_channel_write_chars(channel, (char *) data + sent, len - sent, &ret, NULL);
+		sent += ret;
+	} while (sent < len && status != G_IO_STATUS_ERROR);
+
+	return sent < len ? -1 : 0;
+}
+
+int g_io_channel_read_block(GIOChannel *channel, void *data, int len)
+{
+	time_t maxwait;
+	gsize ret;
+	int received;
+	GIOStatus status;
+
+	maxwait = time(NULL)+2;
+	received = 0;
+	do {
+		status = g_io_channel_read_chars(channel, (char *) data + received, len - received, &ret, NULL);
+		received += ret;
+	} while (received < len && time(NULL) < maxwait &&
+		status != G_IO_STATUS_ERROR && status != G_IO_STATUS_EOF);
+
+	return received < len ? -1 : 0;
+}
+
 IPADDR ip4_any = {
 	AF_INET,
 #if defined(IN6ADDR_ANY_INIT)
diff --git a/src/core/network.h b/src/core/network.h
index e60f607f..30fd6aab 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -36,6 +36,8 @@ GIOChannel *g_io_channel_new(int handle);
 /* Returns 1 if IPADDRs are the same. */
 /* Deprecated since it is unused. It will be deleted in a later release. */
 int net_ip_compare(IPADDR *ip1, IPADDR *ip2) G_GNUC_DEPRECATED;
+int g_io_channel_write_block(GIOChannel *channel, void *data, int len);
+int g_io_channel_read_block(GIOChannel *channel, void *data, int len);
 
 int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip);