Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2005 Pekka Riikonen
+ Copyright (C) 2005 - 2006 Pekka Riikonen
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
*/
-#include "silcincludes.h"
+#include "silc.h"
+
+/************************** Types and definitions ***************************/
#define SILC_IS_SOCKET_STREAM(s) (s->ops == &silc_socket_stream_ops)
+#define SILC_IS_SOCKET_STREAM_UDP(s) (s->ops == &silc_socket_udp_stream_ops)
const SilcStreamOps silc_socket_stream_ops;
+const SilcStreamOps silc_socket_udp_stream_ops;
/* Platform specific functions */
int silc_socket_stream_read(SilcStream stream, unsigned char *buf,
SilcUInt32 data_len);
SilcBool silc_socket_stream_close(SilcStream stream);
void silc_socket_stream_destroy(SilcStream stream);
+int silc_socket_udp_stream_read(SilcStream stream, unsigned char *buf,
+ SilcUInt32 buf_len);
+int silc_socket_udp_stream_write(SilcStream stream, const unsigned char *data,
+ SilcUInt32 data_len);
/* Internal async host lookup context. */
typedef struct {
unsigned int aborted : 1;
} *SilcSocketHostLookup;
+
+/************************ Static utility functions **************************/
+
/* The IO process callback that calls the notifier callback to upper
layer. */
{
SilcSocketStream stream = context;
- if (!stream->notifier)
+ if (silc_unlikely(!stream->notifier))
return;
switch (type) {
stream = lookup->stream = NULL;
}
- /* Add the socket to scheduler */
- if (stream) {
- silc_schedule_task_add_fd(stream->schedule, stream->sock,
- silc_socket_stream_io, stream);
-
- /* Initially set socket for reading */
- silc_schedule_set_listen_fd(stream->schedule, stream->sock,
- SILC_TASK_READ, FALSE);
- }
-
/* Return the created socket stream to the caller */
if (lookup->callback)
lookup->callback(lookup->status, stream, lookup->context);
out:
silc_schedule_task_add_timeout(schedule, silc_socket_host_lookup_finish,
- lookup, 0, 1);
+ lookup, 0, 0);
silc_schedule_wakeup(schedule);
return NULL;
}
lookup->aborted = TRUE;
}
-/* Creates socket stream */
+
+/******************************* Public API *********************************/
+
+/* Creates TCP socket stream */
SilcAsyncOperation
-silc_socket_stream_create(int sock, SilcBool lookup, SilcBool require_fqdn,
- SilcSchedule schedule,
- SilcSocketStreamCallback callback,
- void *context)
+silc_socket_tcp_stream_create(int sock, SilcBool lookup,
+ SilcBool require_fqdn,
+ SilcSchedule schedule,
+ SilcSocketStreamCallback callback,
+ void *context)
{
SilcSocketStream stream;
SilcSocketHostLookup l;
return NULL;
}
- SILC_LOG_DEBUG(("Creating new socket stream %p", stream));
+ SILC_LOG_DEBUG(("Creating TCP socket stream %p", stream));
stream->ops = &silc_socket_stream_ops;
stream->sock = sock;
}
}
+/* Creates UDP socket stream */
+
+SilcStream silc_socket_udp_stream_create(int sock, SilcBool ipv6,
+ SilcBool connected,
+ SilcSchedule schedule)
+{
+ SilcSocketStream stream;
+
+ stream = silc_calloc(1, sizeof(*stream));
+ if (!stream)
+ return NULL;
+
+ SILC_LOG_DEBUG(("Creating UDP socket stream %p", stream));
+
+ stream->ops = &silc_socket_udp_stream_ops;
+ stream->sock = sock;
+ stream->schedule = schedule;
+ stream->ipv6 = ipv6;
+ stream->connected = connected;
+
+ return (SilcStream)stream;
+}
+
+/* Returns TRUE if the stream is UDP stream */
+
+SilcBool silc_socket_stream_is_udp(SilcStream stream, SilcBool *connected)
+{
+ SilcSocketStream socket_stream = stream;
+
+ if (!SILC_IS_SOCKET_STREAM_UDP(socket_stream))
+ return FALSE;
+
+ if (connected)
+ *connected = socket_stream->connected;
+
+ return TRUE;
+}
+
/* Returns socket stream information */
SilcBool silc_socket_stream_get_info(SilcStream stream,
- int *sock, const char **hostname,
- const char **ip, SilcUInt16 *port)
+ int *sock, const char **hostname,
+ const char **ip, SilcUInt16 *port)
{
SilcSocketStream socket_stream = stream;
- if (!SILC_IS_SOCKET_STREAM(socket_stream))
+ if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
+ !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
return FALSE;
if (sock)
*sock = socket_stream->sock;
- if (hostname)
+ if (hostname) {
+ if (!socket_stream->hostname)
+ return FALSE;
*hostname = socket_stream->hostname;
- if (ip)
+ }
+ if (ip) {
+ if (!socket_stream->ip)
+ return FALSE;
*ip = socket_stream->ip;
- if (port)
+ }
+ if (port) {
+ if (!socket_stream->port)
+ return FALSE;
*port = socket_stream->port;
+ }
return TRUE;
}
/* Set socket information */
SilcBool silc_socket_stream_set_info(SilcStream stream,
- const char *hostname,
- const char *ip, SilcUInt16 port)
+ const char *hostname,
+ const char *ip, SilcUInt16 port)
{
SilcSocketStream socket_stream = stream;
- if (!SILC_IS_SOCKET_STREAM(socket_stream))
+ if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
+ !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
return FALSE;
if (hostname) {
socket_stream->ip = strdup(ip);
if (!socket_stream->ip)
return FALSE;
+ if (!socket_stream->hostname) {
+ socket_stream->hostname = strdup(ip);
+ if (!socket_stream->hostname)
+ return FALSE;
+ }
}
if (port)
socket_stream->port = port;
{
SilcSocketStream socket_stream = stream;
- if (!SILC_IS_SOCKET_STREAM(socket_stream))
+ if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
+ !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
return 0;
return socket_stream->sock_error;
/* Set QoS for socket stream */
SilcBool silc_socket_stream_set_qos(SilcStream stream,
- SilcUInt32 read_rate,
- SilcUInt32 read_limit_bytes,
- SilcUInt32 limit_sec,
- SilcUInt32 limit_usec)
+ SilcUInt32 read_rate,
+ SilcUInt32 read_limit_bytes,
+ SilcUInt32 limit_sec,
+ SilcUInt32 limit_usec)
{
SilcSocketStream socket_stream = stream;
- if (!SILC_IS_SOCKET_STREAM(socket_stream))
+ if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
+ !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
return FALSE;
SILC_LOG_DEBUG(("Setting QoS for socket stream"));
{
SilcSocketStream socket_stream = stream;
- if (!SILC_IS_SOCKET_STREAM(socket_stream))
+ if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
+ !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
return FALSE;
silc_schedule_unset_listen_fd(socket_stream->schedule, socket_stream->sock);
{
SilcSocketStream socket_stream = stream;
- if (!SILC_IS_SOCKET_STREAM(socket_stream))
+ if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
+ !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
return;
silc_socket_stream_close(socket_stream);
silc_free(socket_stream->ip);
silc_free(socket_stream->hostname);
+ silc_schedule_task_del_by_fd(socket_stream->schedule, socket_stream->sock);
if (socket_stream->qos) {
silc_schedule_task_del_by_context(socket_stream->schedule,
silc_free(socket_stream->qos);
}
+ silc_schedule_wakeup(socket_stream->schedule);
+
silc_free(socket_stream);
}
/* Sets stream notification callback for the stream */
void silc_socket_stream_notifier(SilcStream stream,
+ SilcSchedule schedule,
SilcStreamNotifier callback,
void *context)
{
SilcSocketStream socket_stream = stream;
- if (!SILC_IS_SOCKET_STREAM(socket_stream))
+ if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
+ !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
return;
SILC_LOG_DEBUG(("Setting stream notifier callback"));
socket_stream->notifier = callback;
socket_stream->notifier_context = context;
+ socket_stream->schedule = schedule;
+
+ if (socket_stream->notifier) {
+ /* Add the socket to scheduler. Safe to call if already added. */
+ silc_schedule_task_add_fd(socket_stream->schedule, socket_stream->sock,
+ silc_socket_stream_io, socket_stream);
+
+ /* Initially set socket for reading */
+ silc_schedule_set_listen_fd(socket_stream->schedule, socket_stream->sock,
+ SILC_TASK_READ, FALSE);
+ silc_schedule_wakeup(socket_stream->schedule);
+ } else {
+ /* Unschedule the socket */
+ silc_schedule_unset_listen_fd(socket_stream->schedule,
+ socket_stream->sock);
+ silc_schedule_task_del_by_fd(socket_stream->schedule,
+ socket_stream->sock);
+ silc_schedule_wakeup(socket_stream->schedule);
+ }
+}
+
+/* Return associated scheduler */
+
+SilcSchedule silc_socket_stream_get_schedule(SilcStream stream)
+{
+ SilcSocketStream socket_stream = stream;
+
+ if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
+ !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
+ return NULL;
+
+ return socket_stream->schedule;
}
/* SILC Socket Stream ops. Functions are implemented under the
silc_socket_stream_close,
silc_socket_stream_destroy,
silc_socket_stream_notifier,
+ silc_socket_stream_get_schedule,
+};
+const SilcStreamOps silc_socket_udp_stream_ops =
+{
+ silc_socket_udp_stream_read,
+ silc_socket_udp_stream_write,
+ silc_socket_stream_close,
+ silc_socket_stream_destroy,
+ silc_socket_stream_notifier,
+ silc_socket_stream_get_schedule,
};
projects / silc.git / blobdiff