Changeset 5739:2a1671d592b9 in roaraudio for plugins/roard/protocol-gopher.c

Timestamp:

11/09/12 01:09:22 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

commit 0: make protocol emulations for esd, gopher and rplay more independed so they can be moved into plugins easily (See: #311)

File:

• plugins/roard/protocol-gopher.c (modified) (10 diffs)

plugins/roard/protocol-gopher.c

@@ -631 +631 @@
 }
 
-int emul_gopher_check_client(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) {
+static int emul_gopher_check_client(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_client_server * cs;
- struct roar_vio_calls     rvio;
  struct item * c = NULL;
  char inbuf[1024];
@@ -646 +645 @@
 
  if ( clients_get_server(client, &cs) == -1 ) {
-  clients_delete(client);
   return -1;
  }
 
  ROAR_DBG("emul_gopher_check_client(client=%i, vio=%p) = ?", client, vio);
-
- if ( vio == NULL ) {
-  vio = &rvio;
-  roar_vio_open_fh_socket(vio, clients_get_fh(client));
- }
 
  ROAR_DBG("emul_gopher_check_client(client=%i, vio=%p) = ?", client, vio);
@@ -662 +655 @@
   len = sizeof(inbuf)-1;
   if ( roar_buffer_shift_out(&(cs->inbuf), inbuf, &len) == -1 ) {
-   clients_delete(client);
    return -1;
   }
@@ -668 +660 @@
   if ( cs->inbuf != NULL ) {
    roar_buffer_free(cs->inbuf);
-   clients_delete(client);
    return -1;
   }
@@ -674 +665 @@
   // test if we have still buffer space left.
   if ( len == (sizeof(inbuf)-1) ) {
-   clients_delete(client);
    return -1;
   }
@@ -683 +673 @@
  ret = roar_vio_read(vio, inbuf+len, sizeof(inbuf)-len-1);
  if ( ret < 1 ) {
-  clients_delete(client);
   ROAR_DBG("emul_gopher_check_client(client=%i, vio=%p) = -1", client, vio);
   return -1;
@@ -696 +685 @@
  if ( !strip_nl(inbuf) ) {
   if ( roar_buffer_new_data(&(cs->inbuf), ret, &data) == -1 ) {
-   clients_delete(client);
    ROAR_DBG("emul_gopher_check_client(client=%i, vio=%p) = -1", client, vio);
    return -1;
@@ -719 +707 @@
 
  if ( c == NULL ) {
-  clients_delete(client);
   ROAR_DBG("emul_gopher_check_client(client=%i, vio=%p) = -1", client, vio);
   return -1;
@@ -752 +739 @@
 
  if ( funcret == -1 ) {
-  clients_delete(client);
   ROAR_DBG("emul_gopher_check_client(client=%i, vio=%p) = -1", client, vio);
   return -1;
@@ -762 +748 @@
 }
 
-int emul_gopher_flushed_client(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) {
+static int emul_gopher_flushed_client(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) {
  ROAR_DBG("emul_gopher_flushed_client(client=%i, vio=%p) = ?", client, vio);
 
- return clients_delete(client);
-}
+ return -1;
+}
+
+struct roar_dl_proto __proto_common_gopher = {
+ .proto = ROAR_PROTO_GOPHER,
+ .description = "The Internet Gopher Protocol",
+ .flags = ROAR_DL_PROTO_FLAGS_NONE,
+ .handle = emul_gopher_check_client,
+ .flushed = emul_gopher_flushed_client
+};
 
 #endif