Changeset 6026:d51b782b77c5 in roaraudio for libroar/stream.c

Timestamp:

07/14/14 10:06:28 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

wrote roar_stream_connect_to_advanced() that combines roar_stream_connect_to() and roar_stream_connect_to_ask() in peaparation for v1 CON_STREAM messages and make use of it

File:

• libroar/stream.c (modified) (1 diff)

libroar/stream.c

@@ -299 +299 @@
 
  return 0;
+}
+
+int roar_stream_connect_to_advanced (struct roar_connection * con, struct roar_stream * s,
+                                     int version, int ask_only, uint_least32_t flags,
+                                     int socket_type, ssize_t socket_len, const void * socketaddr,
+                                     int transport_protocol, ssize_t tranport_len, const void * transportsetup,
+                                     uint16_t clientsetup_flags, struct roar_client * clientsetup) {
+ struct roar_message m;
+ char buf[80];
+ int port;
+ uint16_t tmp;
+
+ if ( con == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( transport_protocol == ROAR_PROTO_NONE && (tranport_len != -1 || transportsetup ) ) {
+  roar_err_set(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
+ if ( !((s == NULL) ^ (clientsetup == NULL)) ) {
+  roar_err_set(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
+ switch (version) {
+  case 0:
+    if ( transport_protocol != ROAR_PROTO_NONE || s == NULL) {
+     roar_err_set(ROAR_ERROR_INVAL);
+     return -1;
+    }
+    switch (socket_type) {
+     case ROAR_SOCKET_TYPE_TCP:
+     case ROAR_SOCKET_TYPE_UDP:
+       if ( socket_len != 6 ) {
+        roar_err_set(ROAR_ERROR_FAULT);
+        return -1;
+       }
+       snprintf(buf, sizeof(buf), "%i.%i.%i.%i",
+                ((const unsigned char*)socketaddr)[0], ((const unsigned char*)socketaddr)[1],
+                ((const unsigned char*)socketaddr)[2], ((const unsigned char*)socketaddr)[3]);
+       port = ROAR_NET2HOST16(((const uint16_t*)socketaddr)[3]);
+       if ( roar_stream_connect_to_ask(con, s, socket_type, buf, port) == -1 )
+        return -1;
+      break;
+     case ROAR_SOCKET_TYPE_DECNET:
+       if ( socket_len < 3 ) {
+        roar_err_set(ROAR_ERROR_FAULT);
+        return -1;
+       }
+       tmp  = ((const uint16_t*)socketaddr)[0];
+       port = ((const unsigned char*)socketaddr)[2];
+       snprintf(buf, sizeof(buf), "%i.%i::%*s", tmp >> 10, tmp & 0x03FF, (int)socket_len - 3, (const char*)socketaddr + 3);
+       if ( roar_stream_connect_to_ask(con, s, socket_type, buf, port) == -1 )
+        return -1;
+      break;
+     default:
+       if ( ((const char *)socketaddr)[socket_len-1] == 0 ) {
+        if ( socket_len > sizeof(buf) ) {
+         roar_err_set(ROAR_ERROR_MSGSIZE);
+         return -1;
+        }
+        memcpy(buf, socketaddr, socket_len);
+        if ( roar_stream_connect_to_ask(con, s, socket_type, buf, 0) == -1 )
+         return -1;
+       } else {
+        roar_err_set(ROAR_ERROR_FAULT);
+        return -1;
+       }
+      break;
+    }
+   break;
+  default:
+    roar_err_set(ROAR_ERROR_NSVERSION);
+    return -1;
+   break;
+ }
+
+
+ if ( ask_only )
+  return 0;
+
+ if ( roar_recv_message(con, &m, NULL) == -1 )
+  return -1;
+
+ if ( m.cmd == ROAR_CMD_OK )
+  return 0;
+ return -1;
 }