Changeset 5571:b46ece5b30bf in roaraudio for roard/network.c

Timestamp:

07/17/12 15:03:29 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Improved support in roard for client passing.

File:

• roard/network.c (modified) (3 diffs)

roard/network.c

@@ -70 +70 @@
 
 int net_get_new_client (struct roard_listen * lsock) {
- const struct roard_proto_handle * proto;
+ const struct roard_proto_handle * protohandle;
  int fh;
  int client;
@@ -79 +79 @@
  socklen_t                addrlen = sizeof(addr);
  int supported = 0;
+ int proto = lsock->proto;
 
  if ( roar_vio_ctl(&(lsock->sock), ROAR_VIO_CTL_GET_FH, &socket) == -1 ) {
@@ -95 +96 @@
   return -1;
 
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
- if ( lsock->proto == ROAR_PROTO_RSOUND ) {
-  client = emul_rsound_on_connect(fh, lsock);
-  switch (client) {
-   case -1: return -1; break;
-   case -2: return  0; break;
-   default: // TODO: write error handling
-     clients_get(client, &c);
-     fh = c->fh;
-    break;
+ if ( clients_new_from_fh2(fh, lsock->proto, ROAR_BYTEORDER_NETWORK, 1, lsock, (struct sockaddr*)&addr, &addrlen) == -1 ) {
+  if ( roar_vio_open_fh_socket(&vio, fh) == -1 ) {
+   close(fh);
+   return -1;
   }
- } else {
-#endif
-
- client = clients_new();
-
- if ( client == -1 ) {
-  ROAR_DBG("net_get_new_client(void) = -1 // can not create new client");
-  close(fh);
+  roar_vio_close(&vio);
   return -1;
  }
-
- if ( clients_set_fh(client, fh) == -1 ) {
-  ROAR_ERR("net_get_new_client(void): Can not set client's fh");
-
-  clients_delete(client);
-  close(fh);
-
-  ROAR_DBG("net_get_new_client(void) = -1");
-  return -1;
- }
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
- }
-#endif
-
- if ( clients_get(client, &c) != -1 ) {
-  if ( roar_nnode_free(&(c->nnode)) == -1 )
-   return -1;
-
-  if ( roar_nnode_new_from_sockaddr(&(c->nnode), (struct sockaddr*)&addr, addrlen) == -1 )
-   return -1;
- }
-
- ROAR_DBG("net_get_new_client(*): proto=0x%.4x", lsock->proto);
-
- if ( clients_set_proto(client, lsock->proto) == -1 ) {
-  ROAR_WARN("net_get_new_client(*): Setting proto(0x%.4x) of client %i failed.", lsock->proto, client);
-  return -1;
- }
-
- switch (lsock->proto) {
-  case ROAR_PROTO_ROARAUDIO:
-    // nothing needed to be done here
-   break;
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD
-#ifdef ROAR_HAVE_H_ESD
-  case ROAR_PROTO_ESOUND:
-    ROAR_DBG("net_get_new_client(*): execing ESD CONNECT command");
-
-    if ( roar_vio_open_fh_socket(&vio, fh) == -1 )
-     return -1;
-
-    ROAR_DBG("net_get_new_client(*): creating VIO OK");
-
-    if ( emul_esd_exec_command(client, ESD_PROTO_CONNECT, &vio) == -1 )
-     return -1;
-
-    ROAR_DBG("net_get_new_client(*): CONNECT execed sucessfully");
-   break;
-#endif
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_SIMPLE
-  case ROAR_PROTO_SIMPLE:
-    if ( emul_simple_on_connect(client, lsock) == -1 )
-     return -1;
-   break;
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
-  case ROAR_PROTO_RSOUND: // nothing to do here.
-   break;
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
-  case ROAR_PROTO_RPLAY: // nothing to do here.
-
-    if ( roar_vio_open_fh_socket(&vio, fh) == -1 )
-     return -1;
-
-    if ( emul_rplay_on_status(client, NULL, &vio, NULL, 0) == -1 )
-     return -1;
-   break;
-#endif
-  default:
-    // OS independiend code to close the socket:
-    if ( roar_vio_open_fh_socket(&vio, fh) == -1 )
-     return -1;
-
-    proto = clients_get_protohandle(lsock->proto);
-    supported = 0;
-    if ( proto != NULL ) {
-     switch (proto->type) {
-      case ROARD_PROTO_TYPE_BUILDIN:
-        //this should not end up here.
-        ROAR_WARN("net_get_new_client(lsock=%p): proto(%i) marked as buildin but isn't. BAD.", lsock, lsock->proto);
-        supported = 0;
-       break;
-      case ROARD_PROTO_TYPE_ROARDPROTO:
-        supported = 1;
-        if ( proto->impl.roardproto.new_client != NULL ) {
-         if ( proto->impl.roardproto.new_client(client, &vio, lsock) == -1 ) {
-          supported = 0;
-         }
-        }
-       break;
-     }
-    }
-
-    if ( !supported ) {
-     clients_delete(client);
-     //roar_vio_close(&vio);
-     return -1;
-    }
-   break;
- }
-
-// close(fh);
 
  return 0;