Changeset 5579:3887ff7af8e7 in roaraudio for plugins/universal/protocol-echo.c

Timestamp:

07/21/12 19:40:17 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Converted roard plugins to universal where possible (Closes: #256)

File:

• plugins/universal/protocol-echo.c (modified) (3 diffs)

plugins/universal/protocol-echo.c

@@ -24 +24 @@
  */
 
-#include <roard/include/roard.h>
+#include <roaraudio.h>
 
-static int check_client(int client, struct roar_vio_calls * vio) {
+static int _handle(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen) {
  struct roar_buffer * buf;
  void * data;
  ssize_t len;
 
- ROAR_DBG("check_client(client=%i, vio=%p) = ?", client, vio);
+ (void)client, (void)userdata, (void)para, (void)paralen;
+
+ ROAR_DBG("_handle(client=%i, vio=%p) = ?", client, vio);
 
  if ( roar_buffer_new_data(&buf, 1024, &data) == -1 )
@@ -37 +39 @@
 
  len = roar_vio_read(vio, data, 1024);
-
  if ( len < 1 ) {
-  clients_delete(client);
+  ROAR_DBG("_handle(client=%i, vio=%p) = -1 // error=%s(%i)", client, vio, roar_errorstring, roar_error);
   return -1;
  }
 
  if ( roar_buffer_set_len(buf, len) == -1 ) {
+  ROAR_DBG("_handle(client=%i, vio=%p) = -1 // error=%s(%i)", client, vio, roar_errorstring, roar_error);
   roar_buffer_free(buf);
-  clients_delete(client);
   return -1;
  }
 
- clients_add_output(client, &buf);
+ if ( *obuffer == NULL ) {
+  *obuffer = buf;
+ } else {
+  if ( roar_buffer_moveinto(*obuffer, &buf) == -1 ) {
+   ROAR_DBG("_handle(client=%i, vio=%p) = -1 // error=%s(%i)", client, vio, roar_errorstring, roar_error);
+   return -1;
+  }
+ }
 
- ROAR_DBG("check_client(client=%i, vio=%p) = 0", client, vio);
+ ROAR_DBG("_handle(client=%i, vio=%p) = 0", client, vio);
  return 0;
 }
 
 
-static struct roard_proto proto[1] = {
- {ROAR_PROTO_ECHO, ROAR_SUBSYS_NONE, "Send all data send to the server back to the client", NULL, NULL, NULL, check_client, NULL, NULL}
+static const struct roar_dl_proto proto = {
+ .proto = ROAR_PROTO_ECHO,
+ .description = "Send all data send to the server back to the client",
+ .flags = ROAR_DL_PROTO_FLAGS_NONE,
+ .set_proto = NULL,
+ .unset_proto = NULL,
+ .handle = _handle,
+ .flush = NULL,
+ .flushed = NULL,
+ .status = NULL
 };
 
-ROARD_DL_REG_PROTO(proto)
+static int __reg_proto(struct roar_dl_librarypara * para, struct roar_dl_libraryinst * lib) {
+ (void)para, (void)lib;
+ ROAR_DL_PLUGIN_REG_FN(ROAR_DL_PROTO_SUBTYPE, proto, ROAR_DL_PROTO_VERSION);
+ return 0;
+}
 
 ROAR_DL_PLUGIN_START(protocol_echo) {
- ROARD_DL_CHECK_VERSIONS();
-
  ROAR_DL_PLUGIN_META_PRODUCT_NIV("protocol-echo", ROAR_VID_ROARAUDIO, ROAR_VNAME_ROARAUDIO);
  ROAR_DL_PLUGIN_META_VERSION(ROAR_VERSION_STRING);
@@ -71 +89 @@
  ROAR_DL_PLUGIN_META_DESC("Implementation of a dummy protocol sending all data back to the sender");
 
- ROARD_DL_REGFN_PROTO();
+ ROAR_DL_PLUGIN_REG(ROAR_DL_FN_PROTO, __reg_proto);
 } ROAR_DL_PLUGIN_END