Changeset 200:fc109893f25a in roaraudio

Timestamp:

07/20/08 22:29:08 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

there a a lot cases we can close the socket, only not when it is an execed one

File:

• roard/codecfilter_cmd.c (modified) (2 diffs)

roard/codecfilter_cmd.c

@@ -7 +7 @@
                                              struct roar_codecfilter   * filter) {
  int socks[2];
+ int execed = -1;
 
  if ( socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1 ) {
@@ -15 +16 @@
   return -1;
 
-// we can't close the stream in case this is an execed stream of some client.
-// close(((struct roar_stream*)info)->fh);
+ if ( info->client != -1 ) {
+  execed = g_clients[info->client]->execed;
+
+  if ( execed != -1 ) {
+   if ( g_streams[execed] == info ) {
+    g_clients[info->client]->fh = socks[0];
+   } else {
+    close(((struct roar_stream*)info)->fh);
+   }
+  } else {
+   close(((struct roar_stream*)info)->fh);
+  }
+ } else {
+  close(((struct roar_stream*)info)->fh);
+ }
+
  ((struct roar_stream*)info)->fh = socks[0];
  ((struct roar_stream*)info)->info.codec = ROAR_CODEC_DEFAULT;