Changeset 5606:f7617b41972e in roaraudio

Timestamp:

07/31/12 02:33:55 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Updated common protocol interface (Closes: #257, #256)

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/roardl.h (modified) (2 diffs)
• plugins/universal/protocol-daytime.c (modified) (3 diffs)
• plugins/universal/protocol-discard.c (modified) (1 diff)
• plugins/universal/protocol-echo.c (modified) (1 diff)
• plugins/universal/tic-tac-toe.c (modified) (3 diffs)
• roard/clients.c (modified) (9 diffs)

ChangeLog

@@ -17 +17 @@
         * Added roar_buffer_moveintoqueue() (Closes: #283) (pr1)
         * Typo corrections (Closes: #282) (pr1)
+        * Updated common protocol interface (Closes: #257, #256) (pr1)
 
 v. 1.0beta3 - Sun Jul 15 2012 26:08 CEST

include/libroar/roardl.h

@@ -332 +332 @@
    struct roar_dl_lhandle * lhandle  // The registering handle.
                                      // This is valid until the object is unregistered.
-                                     // Only roar_dl_context_restore() and roar_dl_context_store()
-                                     // may be used on this object. Result of all other functions
-                                     // is undefined.
+                                     // Only roar_dl_context_restore(), roar_dl_context_store()
+                                     // and roar_dl_getpara() may be used on this object.
+                                     // Result of all other functions is undefined.
  );
  void * userdata; // The user data pointer passed to the callback.
@@ -350 +350 @@
  const char * description;
  const int flags;
- int (*set_proto)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen);
- int (*unset_proto)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen);
- int (*handle)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen);
- int (*flush)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen);
- int (*flushed)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen);
- int (*status)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen);
+ int (*set_proto)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara);
+ int (*unset_proto)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara);
+ int (*handle)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara);
+ int (*flush)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara);
+ int (*flushed)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara);
+ int (*status)(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara);
 };
 

plugins/universal/protocol-daytime.c

@@ -26 +26 @@
 #include <roaraudio.h>
 
-static int _set_proto(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen) {
+static int _set_proto(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara) {
  struct roar_buffer * buf;
  void * data;
@@ -33 +33 @@
  char * date = asctime(gmtime(&now));
 
- (void)client, (void)vio, (void)userdata, (void)para, (void)paralen;
+ (void)client, (void)vio, (void)userdata, (void)protopara, (void)protoparalen, (void)pluginpara;
 
  len = roar_mm_strlen(date) + 1;
@@ -48 +48 @@
 }
 
-static int _flushed(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen) {
- (void)client, (void)vio, (void)obuffer, (void)userdata, (void)para, (void)paralen;
+static int _flushed(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara) {
+ (void)client, (void)vio, (void)obuffer, (void)userdata, (void)protopara, (void)protoparalen, (void)pluginpara;
 
  roar_err_set(ROAR_ERROR_NODATA);

plugins/universal/protocol-discard.c

@@ -26 +26 @@
 #include <roaraudio.h>
 
-static int _handle(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen) {
+static int _handle(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara) {
  char buf[4096];
 
- (void)client, (void)obuffer, (void)userdata, (void)para, (void)paralen;
+ (void)client, (void)obuffer, (void)userdata, (void)protopara, (void)protoparalen, (void)pluginpara;
 
  if ( roar_vio_read(vio, buf, sizeof(buf)) < 1 ) {

plugins/universal/protocol-echo.c

@@ -26 +26 @@
 #include <roaraudio.h>
 
-static int _handle(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen) {
+static int _handle(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara) {
  struct roar_buffer * buf;
  void * data;
  ssize_t len;
 
- (void)client, (void)userdata, (void)para, (void)paralen;
+ (void)client, (void)userdata, (void)protopara, (void)protoparalen, (void)pluginpara;
 
  ROAR_DBG("_handle(client=%i, vio=%p) = ?", client, vio);

plugins/universal/tic-tac-toe.c

@@ -253 +253 @@
 }
 
-static int _set_proto(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen) {
+static int _set_proto(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara) {
  game_state * state;
 
- (void)client, (void)vio, (void)obuffer, (void)para, (void)paralen;
+ (void)client, (void)vio, (void)obuffer, (void)protopara, (void)protoparalen, (void)pluginpara;
 
  state = roar_mm_malloc(sizeof(game_state));
@@ -301 +301 @@
 }
 
-static int _handle(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * para, ssize_t paralen) {
+static int _handle(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara) {
  char buf[32];
  ssize_t len;
@@ -310 +310 @@
  char c;
 
- (void)client, (void)obuffer, (void)para, (void)paralen;
+ (void)client, (void)obuffer, (void)protopara, (void)protoparalen, (void)pluginpara;
 
  ROAR_DBG("check_client(client=%i, vio=%p) = ?", client, vio);

roard/clients.c

@@ -143 +143 @@
                          struct roard_listen * lsock, struct sockaddr * sockaddr, socklen_t addrlen) {
  const struct roard_proto_handle * protohandle;
+ struct roar_dl_librarypara * pluginpara;
  struct roar_vio_calls    vio;
  struct roar_client_server * cs;
@@ -287 +288 @@
         supported = 1;
         if ( protohandle->impl.common->set_proto != NULL ) {
-         if ( protohandle->impl.common->set_proto(client, &vio, &(cs->outbuf), &(cs->protoinst), protohandle->para, protohandle->paralen) == -1 ) {
+         pluginpara = roar_dl_getpara(protohandle->lhandle); // will return NULL in case protohandle->lhandle is NULL.
+         if ( protohandle->impl.common->set_proto(client, &vio, &(cs->outbuf), &(cs->protoinst), protohandle->para, protohandle->paralen, pluginpara) == -1 ) {
           supported = 0;
          }
+         if ( pluginpara != NULL )
+          roar_dl_para_unref(pluginpara);
         }
        break;
@@ -312 +316 @@
  struct roar_client_server * cs;
  const struct roard_proto_handle * proto;
+ struct roar_dl_librarypara * pluginpara;
  struct roar_vio_calls vio;
  int i;
@@ -337 +342 @@
      if ( proto->impl.common->unset_proto != NULL ) {
       roar_vio_open_fh_socket(&vio, clients_get_fh(id));
-      proto->impl.common->unset_proto(id, &vio, &(cs->outbuf), &(cs->protoinst), proto->para, proto->paralen);
+      pluginpara = roar_dl_getpara(proto->lhandle); // will return NULL in case protohandle->lhandle is NULL.
+      proto->impl.common->unset_proto(id, &vio, &(cs->outbuf), &(cs->protoinst), proto->para, proto->paralen, pluginpara);
+      if ( pluginpara != NULL )
+       roar_dl_para_unref(pluginpara);
      }
     break;
@@ -723 +731 @@
  struct roar_error_state errstate;
  const struct roard_proto_handle * proto;
+ struct roar_dl_librarypara * pluginpara;
  int command_error;
  char * data = NULL;
@@ -834 +843 @@
        break;
       case ROARD_PROTO_TYPE_COMMON:
-        if ( proto->impl.common->handle != NULL )
-         rv = proto->impl.common->handle(id, &vio, &(cs->outbuf), &(cs->protoinst), proto->para, proto->paralen);
+        if ( proto->impl.common->handle != NULL ) {
+         pluginpara = roar_dl_getpara(proto->lhandle); // will return NULL in case protohandle->lhandle is NULL.
+         rv = proto->impl.common->handle(id, &vio, &(cs->outbuf), &(cs->protoinst), proto->para, proto->paralen, pluginpara);
+         if ( pluginpara != NULL )
+          roar_dl_para_unref(pluginpara);
+        }
         if ( rv == -1 )
          rv = clients_delete(id);
@@ -858 +871 @@
  struct roar_client              * c;
  const struct roard_proto_handle * p;
+ struct roar_dl_librarypara * pluginpara;
  size_t len;
  ssize_t ret;
@@ -892 +906 @@
      if ( p->lhandle != NULL )
       roar_dl_context_restore(p->lhandle);
-     rv = p->impl.common->flush(id, &vio, &(cs->outbuf), &(cs->protoinst), p->para, p->paralen);
+     pluginpara = roar_dl_getpara(p->lhandle); // will return NULL in case protohandle->lhandle is NULL.
+     rv = p->impl.common->flush(id, &vio, &(cs->outbuf), &(cs->protoinst), p->para, p->paralen, pluginpara);
      if ( p->lhandle != NULL )
       roar_dl_context_store(p->lhandle);
+     if ( pluginpara != NULL )
+      roar_dl_para_unref(pluginpara);
      if ( rv == -1 )
       rv = clients_delete(id);
@@ -946 +963 @@
       if ( p->lhandle != NULL )
        roar_dl_context_restore(p->lhandle);
-      rv = p->impl.common->flushed(id, &vio, &(cs->outbuf), &(cs->protoinst), p->para, p->paralen);
+      pluginpara = roar_dl_getpara(p->lhandle); // will return NULL in case protohandle->lhandle is NULL.
+      rv = p->impl.common->flushed(id, &vio, &(cs->outbuf), &(cs->protoinst), p->para, p->paralen, pluginpara);
       if ( p->lhandle != NULL )
        roar_dl_context_store(p->lhandle);
+      if ( pluginpara != NULL )
+       roar_dl_para_unref(pluginpara);
       if ( rv == -1 )
        rv = clients_delete(id);