projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
lib
/
silcutil
/
win32
/
silcwin32sockconn.c
diff --git
a/lib/silcutil/win32/silcwin32sockconn.c
b/lib/silcutil/win32/silcwin32sockconn.c
index 44115731d1865fb38923db403bfde363122a2811..144eeba9acc998ac7f728b324c15c2c3a1a82c36 100644
(file)
--- a/
lib/silcutil/win32/silcwin32sockconn.c
+++ b/
lib/silcutil/win32/silcwin32sockconn.c
@@
-33,6
+33,9
@@
int silc_socket_write(SilcSocketConnection sock)
SOCKET fd = sock->sock;
SilcBuffer src = sock->outbuf;
SOCKET fd = sock->sock;
SilcBuffer src = sock->outbuf;
+ if (SILC_IS_DISABLED(sock))
+ return -1;
+
SILC_LOG_DEBUG(("Writing data to socket %d", fd));
if (src->len > 0) {
SILC_LOG_DEBUG(("Writing data to socket %d", fd));
if (src->len > 0) {
@@
-44,6
+47,7
@@
int silc_socket_write(SilcSocketConnection sock)
return -2;
}
SILC_LOG_ERROR(("Cannot write to socket: %d", (int)fd));
return -2;
}
SILC_LOG_ERROR(("Cannot write to socket: %d", (int)fd));
+ sock->sock_error = err;
return -1;
}
return -1;
}
@@
-67,6
+71,9
@@
int silc_socket_read(SilcSocketConnection sock)
SOCKET fd = sock->sock;
int argp;
SOCKET fd = sock->sock;
int argp;
+ if (SILC_IS_DISABLED(sock))
+ return -1;
+
SILC_LOG_DEBUG(("Reading data from socket %d", fd));
/* Check whether there is data available, without calling recv(). */
SILC_LOG_DEBUG(("Reading data from socket %d", fd));
/* Check whether there is data available, without calling recv(). */
@@
-88,6
+95,7
@@
int silc_socket_read(SilcSocketConnection sock)
return -2;
}
SILC_LOG_ERROR(("Cannot read from socket: %d", (int)fd));
return -2;
}
SILC_LOG_ERROR(("Cannot read from socket: %d", (int)fd));
+ sock->sock_error = err;
return -1;
}
return -1;
}
@@
-110,3
+118,12
@@
int silc_socket_read(SilcSocketConnection sock)
return len;
}
return len;
}
+
+/* Returns human readable socket error message */
+
+bool silc_socket_get_error(SilcSocketConnection sock, char *error,
+ SilcUInt32 error_len)
+{
+ /* XXX TODO */
+ return FALSE;
+}