Changeset 4705:109ee6f17831 in roaraudio for plugins/roard

Timestamp:

01/06/11 02:37:55 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got gopher finally working, now moving myself into sleepingbag device...

File:

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

plugins/roard/protocol-gopher.c

@@ -71 +71 @@
 }
 
-static int send_menu (int client, struct roar_gopher_menu * menu) {
+static int send_menu (int client, struct roar_gopher_menu * menu, struct roar_vio_calls * vio) {
  struct roar_buffer * buf;
  struct roar_gopher_menu_item * item;
@@ -78 +78 @@
  void * data;
  char * chardata;
- char * host;
+ const char * host;
  unsigned int port;
+ struct roar_sockname sockaddr;
+
+ if ( roar_vio_ctl(vio, ROAR_VIO_CTL_GET_SOCKNAME, &sockaddr) == -1 ) {
+  memset(&sockaddr, 0, sizeof(sockaddr));
+ }
 
  for (i = 0; i < menu->items_len; i++) {
   item = &(menu->items[i]);
-  if ( roar_buffer_new_data(&buf, len, &data) == -1 )
-   return -1;
+  if ( roar_buffer_new_data(&buf, len, &data) == -1 ) {
+   if ( sockaddr.addr != NULL )
+    roar_mm_free(sockaddr.addr);
+   return -1;
+  } 
 
   chardata = data;
@@ -93 +101 @@
     break;
    default:
-     host = item->host;
-     port = item->port;
+     host = item->host == NULL ? sockaddr.addr : item->host;
+     port = item->port ==    0 ? sockaddr.port : item->port;
      snprintf(data, len-1, "%c%s\t%s\t%s\t%u\r\n", item->type, item->name, item->selector, host, port);
     break;
@@ -106 +114 @@
  }
 
- return 0;
-}
-
-static int send_text (int client, const char * text) {
+ if ( sockaddr.addr != NULL )
+  roar_mm_free(sockaddr.addr);
+
+ return 0;
+}
+
+static int send_text (int client, const char * text, struct roar_vio_calls * vio) {
  struct roar_buffer * buf;
  void * data;
@@ -199 +210 @@
  switch (c->type) {
   case _DIR:
-    funcret = send_menu(client, &(c->menu));
+    funcret = send_menu(client, &(c->menu), vio);
    break;
   case _FILE:
-    funcret = send_text(client, c->text);
+    funcret = send_text(client, c->text, vio);
    break;
   default: