summaryrefslogtreecommitdiffstats
path: root/server/reds_stream.c
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2013-10-07 14:18:32 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2014-01-20 12:15:41 +0100
commite0abf1adc23886ecf99ad110d2151b187b75919e (patch)
treef3867a61d51b65d2d35275530f9b200a26a27382 /server/reds_stream.c
parentd533f72fe6d20a20f26846a3b3c43b3571f4f2a8 (diff)
downloadspice-e0abf1adc23886ecf99ad110d2151b187b75919e.tar.gz
spice-e0abf1adc23886ecf99ad110d2151b187b75919e.tar.xz
spice-e0abf1adc23886ecf99ad110d2151b187b75919e.zip
Introduce reds_stream_new() helper
Initializing a new stream means initializing quite a few fields. This commit factors this initialization in a dedicated reds_stream_new helper. This also helps moving more code from reds.c to reds_stream.c
Diffstat (limited to 'server/reds_stream.c')
-rw-r--r--server/reds_stream.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/server/reds_stream.c b/server/reds_stream.c
index 5ec0efa8..e9337cf9 100644
--- a/server/reds_stream.c
+++ b/server/reds_stream.c
@@ -149,6 +149,35 @@ void reds_stream_push_channel_event(RedsStream *s, int event)
main_dispatcher_channel_event(event, s->info);
}
+static void reds_stream_set_socket(RedsStream *stream, int socket)
+{
+ stream->socket = socket;
+ /* deprecated fields. Filling them for backward compatibility */
+ stream->info->llen = sizeof(stream->info->laddr);
+ stream->info->plen = sizeof(stream->info->paddr);
+ getsockname(stream->socket, (struct sockaddr*)(&stream->info->laddr), &stream->info->llen);
+ getpeername(stream->socket, (struct sockaddr*)(&stream->info->paddr), &stream->info->plen);
+
+ stream->info->flags |= SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT;
+ stream->info->llen_ext = sizeof(stream->info->laddr_ext);
+ stream->info->plen_ext = sizeof(stream->info->paddr_ext);
+ getsockname(stream->socket, (struct sockaddr*)(&stream->info->laddr_ext),
+ &stream->info->llen_ext);
+ getpeername(stream->socket, (struct sockaddr*)(&stream->info->paddr_ext),
+ &stream->info->plen_ext);
+}
+
+RedsStream *reds_stream_new(int socket)
+{
+ RedsStream *stream;
+
+ stream = spice_new0(RedsStream, 1);
+ stream->info = spice_new0(SpiceChannelEventInfo, 1);
+ reds_stream_set_socket(stream, socket);
+
+ return stream;
+}
+
RedsStreamSslStatus reds_stream_ssl_accept(RedsStream *stream)
{
int ssl_error;