Changeset 3820:105b2c84ffdc in roaraudio

Timestamp:

05/11/10 14:20:16 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

started with better protocol support for RSD

Location:

roard

Files:

• clients.c (modified) (1 diff)
• emul_rsound.c (modified) (1 diff)
• include/emul_rsound.h (modified) (1 diff)

roard/clients.c

@@ -457 +457 @@
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD
   case ROAR_PROTO_RSOUND:
-    rv = clients_delete(id);
+    rv = emul_rsound_check_client(id, NULL);
    break;
 #endif

roard/emul_rsound.c

@@ -132 +132 @@
 }
 
+int emul_rsound_vrecv_msg(struct emul_rsound_msg * msg, struct roar_vio_calls * vio) {
+ ssize_t ret;
+ int     num;
+
+ if ( msg == NULL || vio == NULL )
+  return -1;
+
+ ret = roar_vio_read(vio, msg->header, EMUL_RSOUND_MSG_HEADER_LEN);
+
+ if ( ret != EMUL_RSOUND_MSG_HEADER_LEN )
+  return -1;
+
+ msg->header[ret] = 0;
+
+ if ( msg->header[0] != 'R' || msg->header[1] != 'S' || msg->header[2] != 'D' )
+  return -1;
+
+ if ( sscanf(&(msg->header[3]), "%5d", &num) != 1 )
+  return -1;
+
+ if ( num > EMUL_RSOUND_MSG_DATA_LEN )
+  return -1;
+
+ msg->datalen = num;
+
+ ret = roar_vio_read(vio, msg->data, num);
+
+ if ( ret != (ssize_t)num )
+  return -1;
+
+ msg->data[num] = 0;
+
+ msg->datasp   = msg->data;
+ msg->dataslen = msg->datalen;
+
+ for (num = 0; msg->data[num] == ' '; num++) {
+  msg->datasp++;
+  msg->dataslen--;
+ }
+
+ return 0;
+}
+
+int emul_rsound_vsend_msg(struct emul_rsound_msg * msg, struct roar_vio_calls * vio) {
+ ssize_t ret;
+
+ if ( msg == NULL || vio == NULL )
+  return -1;
+
+ snprintf(msg->header, EMUL_RSOUND_MSG_HEADER_LEN+1, "RSD%5d", msg->datalen);
+
+ ret = roar_vio_write(vio, msg->header, EMUL_RSOUND_MSG_HEADER_LEN);
+
+ if ( ret != EMUL_RSOUND_MSG_HEADER_LEN )
+  return -1;
+
+ ret = roar_vio_write(vio, msg->data, msg->datalen);
+
+ if ( ret != (ssize_t)msg->datalen )
+  return -1;
+
+ return 0;
+}
+
+int emul_rsound_check_client(int client, struct roar_vio_calls * vio) {
+ struct roar_vio_calls rvio;
+ struct emul_rsound_msg msg;
+
+ if ( vio == NULL ) {
+  vio = &rvio;
+  roar_vio_open_fh_socket(vio, clients_get_fh(client));
+ }
+
+ if ( emul_rsound_vrecv_msg(&msg, vio) == -1 )
+  return clients_delete(client);
+
+ if ( !strncmp(msg.datasp, "INFO", 4) ) {
+  // TODO: add support for INFO
+  return clients_delete(client);
+ } else if ( !strncmp(msg.datasp, "NULL", 4) ) {
+  // NULL is simular to NOOP
+  return 0;
+ } else if ( !strncmp(msg.datasp, "STOP", 4) ) {
+  // This is quit.
+  return clients_delete(client);
+ } else {
+  return clients_delete(client);
+ }
+}
 #endif
 

roard/include/emul_rsound.h

@@ -31 +31 @@
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
 
+#define EMUL_RSOUND_MSG_HEADER_LEN (3+5)
+#define EMUL_RSOUND_MSG_DATA_LEN   (64)
+
+struct emul_rsound_msg {
+ char header[EMUL_RSOUND_MSG_HEADER_LEN+1];
+ size_t datalen;
+ char data[EMUL_RSOUND_MSG_DATA_LEN+1];
+ char * datasp;
+ size_t dataslen;
+};
+
+int emul_rsound_vrecv_msg(struct emul_rsound_msg * msg, struct roar_vio_calls * vio);
+int emul_rsound_vsend_msg(struct emul_rsound_msg * msg, struct roar_vio_calls * vio);
+
 int emul_rsound_on_connect  (int fh, struct roard_listen * lsock);
+int emul_rsound_check_client(int client, struct roar_vio_calls * vio);
 
 #endif