Changeset 5377:72f1d48ff502 in roaraudio for libroar/simple.c

Timestamp:

12/23/11 22:09:58 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed legacy functions (Closes: #130):

• roar_vio_init_calls(),
• roar_vio_set_inst(),
• roar_vio_set_fh() and roar_vio_get_fh(),
• roar_simple_new_stream_obj().

File:

• libroar/simple.c (modified) (2 diffs)

libroar/simple.c

@@ -36 +36 @@
 #include "libroar.h"
 
-static int roar_simple_stream_obj  (struct roar_stream * s, uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, const char * server, int dir, const char * name, int mixer) _LIBROAR_ATTR_DEPRECATED;
+static int roar_simple_stream_obj  (struct roar_stream * s, uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, const char * server, int dir, const char * name, int mixer);
 
 int roar_simple_connect (struct roar_connection * con, const char * server, const char * name) {
@@ -136 +136 @@
 }
 
-int roar_simple_new_stream_obj (struct roar_connection * con, struct roar_stream * s, uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, int dir, int mixer) {
- struct roar_libroar_config * config = roar_libroar_get_config();
- char file[80] = {0};
- int fh = -1, listen = -1;
- static int count = 0;
- int    type = ROAR_SOCKET_TYPE_UNIX;
- int    port = 0;
-#if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_LIBDNET)
- int    opt  = 1;
-#endif
-#ifdef ROAR_HAVE_IPV4
- struct sockaddr_in   socket_addr;
- socklen_t            len            = sizeof(struct sockaddr_in);
-#else
- struct sockaddr      socket_addr;
- socklen_t            len            = sizeof(struct sockaddr);
-#endif
-#ifdef ROAR_HAVE_SELECT
- int confh;
- fd_set fds;
- struct timeval timeout = {10, 0};
- struct roar_message    mes;
-#endif
-#ifdef ROAR_HAVE_UNIX
- int socks[2]; // for socketpair()
-#endif
-
- // make valgrind happy
- memset(&socket_addr, 0, sizeof(socket_addr));
-#ifdef ROAR_HAVE_SELECT
- memset(&mes,         0, sizeof(mes));
-#endif
-
- roar_debug_warn_sysio("roar_simple_new_stream_obj", "roar_vio_simple_new_stream_obj", NULL);
-
- if ( config != NULL ) {
-  if ( config->workaround.workarounds & ROAR_LIBROAR_CONFIG_WAS_USE_EXECED ) {
-   return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir, mixer);
-  }
- }
-
-#ifdef ROAR_HAVE_BSDSOCKETS
- roar_libroar_nowarn();
- if ( getsockname(roar_get_connection_fh(con), (struct sockaddr *)&socket_addr, &len) == -1 ) {
-  roar_libroar_warn();
-  return -1;
- }
- roar_libroar_warn();
-#else
- return -1;
-#endif
-
- if ( len == 0 ) {
-#ifdef ROAR_OS_OPENBSD
-  ROAR_WARN("roar_simple_new_stream_obj(*): Unknown address family: guess AF_UNIX because OS is OpenBSD");
-  ((struct sockaddr*)&socket_addr)->sa_family = AF_UNIX;
-#else
-  return -1;
-#endif
- }
-
- switch (((struct sockaddr*)&socket_addr)->sa_family) {
-#ifdef ROAR_HAVE_UNIX
-  case AF_UNIX:   type = ROAR_SOCKET_TYPE_UNIX; break;
-#endif
-#ifdef ROAR_HAVE_IPV4
-  case AF_INET:   type = ROAR_SOCKET_TYPE_INET; break;
-#endif
-#ifdef ROAR_HAVE_LIBDNET
-  case AF_DECnet: type = ROAR_SOCKET_TYPE_DECNET; break;
-#endif
-  default:
-    return -1;
-   break;
- }
-
- if ( type == ROAR_SOCKET_TYPE_DECNET ) {
-  if ( roar_socket_get_local_nodename() ) {
-   snprintf(file, 24, "%s::roar$TMP%04x%02x", roar_socket_get_local_nodename(), getpid(), count++);
-  } else {
-   return -1;
-  }
-#ifdef ROAR_HAVE_IPV4
- } else {
-  strncpy(file, inet_ntoa(socket_addr.sin_addr), sizeof(file) - 1);
-#endif
- }
-
- if ( type != ROAR_SOCKET_TYPE_UNIX ) {
-  if ( (listen = roar_socket_listen(type, file, port)) == -1 ) {
-   return -1;
-  }
- }
-
- if ( type == ROAR_SOCKET_TYPE_INET ) {
-#ifdef ROAR_HAVE_IPV4
-  len = sizeof(struct sockaddr_in);
-  setsockopt(listen, SOL_SOCKET, SO_REUSEADDR, (void*)&opt, sizeof(int));
-
-  if ( getsockname(listen, (struct sockaddr *)&socket_addr, &len) == -1 ) {
-   return -1;
-  }
-  port = ROAR_NET2HOST16(socket_addr.sin_port);
-  ROAR_DBG("roar_simple_new_stream_obj(*): port=%i", port);
-#else
-  return -1;
-#endif
- } else if ( type == ROAR_SOCKET_TYPE_DECNET ) {
-#ifdef ROAR_HAVE_LIBDNET
-  len = sizeof(struct sockaddr_in);
-  setsockopt(listen, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));
-#else
-  return -1;
-#endif
- }
-
- if ( roar_stream_new(s, rate, channels, bits, codec) == -1 ) {
-  return -1;
- }
-
- if ( roar_stream_connect(con, s, dir, mixer) == -1 ) {
-  return -1;
- }
-
- if ( type != ROAR_SOCKET_TYPE_UNIX ) {
-#ifdef ROAR_HAVE_SELECT
-  if ( roar_stream_connect_to_ask(con, s, type, file, port) != -1 ) {
-
-   FD_ZERO(&fds);
-   FD_SET(listen, &fds);
-
-   confh = roar_get_connection_fh(con);
-
-   if ( confh != -1 ) {
-    FD_SET(confh, &fds);
-   }
-
-   if ( select((confh > listen ? confh : listen) + 1, &fds, NULL, NULL, &timeout) < 1 ) {
-    close(listen);
-
-    // we don't need to check the content as we know it failed...
-    if ( roar_recv_message(con, &mes, NULL) == -1 )
-     return -1;
-
-    if ( roar_kick(con, ROAR_OT_STREAM, s->id) == -1 )
-     return -1;
-
-    return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir, mixer);
-   }
-
-   if ( FD_ISSET(listen, &fds) ) {
-    if ( (fh = accept(listen, NULL, NULL)) != -1 ) {
-     /* errr, do we need we any error handling here? */
-    }
-
-    if ( roar_recv_message(con, &mes, NULL) == -1 ) {
-     if ( fh != -1 )
-      close(fh);
-     fh = -1;
-    } else if ( mes.cmd != ROAR_CMD_OK ) {
-     if ( fh != -1 )
-      close(fh);
-     fh = -1;
-    }
-   } else {
-    // we don't need to check the content as we know it failed...
-    if ( roar_recv_message(con, &mes, NULL) == -1 ) {
-     close(listen);
-     return -1;
-    }
-
-    if ( mes.cmd != ROAR_CMD_OK ) {
-     close(listen);
-     if ( roar_kick(con, ROAR_OT_STREAM, s->id) == -1 )
-      return -1;
-
-     return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir, mixer);
-    } else { // seems like we have a positive reply. So we retry the listen socket:
-     FD_ZERO(&fds);
-     FD_SET(listen, &fds);
-     timeout.tv_sec = 0;
-     timeout.tv_usec = 128000L;
-     fh = -1;
-     if ( select(listen + 1, &fds, NULL, NULL, &timeout) > 0 ) {
-      if ( (fh = accept(listen, NULL, NULL)) == -1 ) {
-       close(listen);
-       if ( roar_kick(con, ROAR_OT_STREAM, s->id) == -1 )
-        return -1;
-
-       return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir, mixer);
-      }
-     }
-    }
-   }
-  }
-
-  close(listen);
-#else
-  return -1;
-#endif
- } else { // this is type == ROAR_SOCKET_TYPE_UNIX
-#ifdef ROAR_HAVE_UNIX
-  if ( socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1 ) {
-   roar_kick(con, ROAR_OT_STREAM, s->id); // we do not need to check for errors
-                                          // as we return -1 in both whys
-   return -1;
-  }
-
-  if ( roar_stream_passfh(con, s, socks[0]) == -1 ) {
-   roar_kick(con, ROAR_OT_STREAM, s->id); // we do not need to check for errors
-                                          // as we return -1 anyway.
-   close(socks[0]);
-   close(socks[1]);
-   return -1;
-  }
-
-  close(socks[0]);
-  fh = socks[1];
-#else
-  roar_kick(con, ROAR_OT_STREAM, s->id);
-  return -1;
-#endif
- }
-
-/*
- if ( type == ROAR_SOCKET_TYPE_UNIX ) {
-  unlink(file);
- }
-*/
-
- if ( fh != -1 ) {
-  if ( dir == ROAR_DIR_PLAY ) {
-   (void)ROAR_SHUTDOWN(fh, SHUT_RD);
-  } else if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD ) {
-   (void)ROAR_SHUTDOWN(fh, SHUT_WR);
-  }
- }
-
- s->fh = fh;
-
- return fh;
-}
-
-
 int roar_simple_play_file(const char * file, const char * server, const char * name) {
  roar_vs_t * vss;