Changeset 5367:b2aae2f6b2d7 in roaraudio

Timestamp:

12/20/11 05:26:54 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added VIO/DSTR for SOCKS proxy (See: #187)

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/libroar.h (modified) (1 diff)
• include/libroar/vio_dstr.h (modified) (1 diff)
• include/libroar/vio_proxy.h (added)
• libroar/Makefile (modified) (1 diff)
• libroar/vio_dstr.c (modified) (9 diffs)
• libroar/vio_proxy.c (added)

ChangeLog

@@ -7 +7 @@
         * Removed old roarclients (See: #130)
         * Improved plugin loader a lot (Closes: #190)
+        * Added VIO/DSTR for SOCKS proxy (See: #187)
 
 v. 0.4 - Fri Nov 11 2011 20:12 CET

include/libroar/libroar.h

@@ -150 +150 @@
 #include "vio_winsock.h"
 #include "vio_proto.h"
+#include "vio_proxy.h"
 #include "vio_rtp.h"
 #include "vio_select.h"

include/libroar/vio_dstr.h

@@ -190 +190 @@
                                     int (*openvio)(struct roar_vio_calls      * calls,
                                                    struct roar_vio_calls      * dst,
-                                                   struct roar_vio_dstr_chain * cur));
+                                                   struct roar_vio_dstr_chain * cur,
+                                                   struct roar_vio_dstr_chain * next));
 
 int     roar_vio_dstr_init_defaults (struct roar_vio_defaults * def, int type, int o_flags, mode_t o_mode);

libroar/Makefile

@@ -7 +7 @@
 VIO_META=vio.o vio_select.o vio_ops.o vio_string.o
 VIO_BRIDGE=vio_bio.o vio_stdio.o
-VIO=$(VIO_META) $(VIO_BRIDGE) vio_cmd.o vio_magic.o vio_pipe.o vio_socket.o vio_winsock.o vio_stack.o vio_jumbo.o vio_proto.o vio_dstr.o vio_tantalos.o vio_rtp.o vio_buffer.o vio_buffer_store.o vio_stdvios.o vio_misc.o vio_zlib.o vio_stream.o
+VIO=$(VIO_META) $(VIO_BRIDGE) vio_cmd.o vio_magic.o vio_pipe.o vio_socket.o vio_winsock.o vio_stack.o vio_jumbo.o vio_proto.o vio_dstr.o vio_tantalos.o vio_rtp.o vio_buffer.o vio_buffer_store.o vio_stdvios.o vio_misc.o vio_zlib.o vio_stream.o vio_proxy.o
 HASHES=hash.o hash_tiger.o
 PASSWORD=passwordapi.o pinentry.o sshaskpass.o

libroar/vio_dstr.c

@@ -41 +41 @@
  const char * name;
  int (* setdef) (struct roar_vio_dstr_chain * cur,   struct roar_vio_dstr_chain * next);
- int (* openvio)(struct roar_vio_calls      * calls, struct roar_vio_calls      * dst, struct roar_vio_dstr_chain * cur);
+ int (* openvio)(struct roar_vio_calls      * calls, struct roar_vio_calls      * dst, struct roar_vio_dstr_chain * cur, struct roar_vio_dstr_chain * next);
  int    pdeftype[16];
 } _roar_vio_dstr_objs[] = {
@@ -105 +105 @@
 
  {ROAR_VIO_DSTR_OBJT_SOCKS,      "socks",
-      NULL, NULL,
+      roar_vio_proxy_setdef, roar_vio_proxy_openvio,
       {ROAR_VIO_DEF_TYPE_EOL}},
  {ROAR_VIO_DSTR_OBJT_SOCKS4,     "socks4",
-      NULL, NULL,
+      roar_vio_proxy_setdef, roar_vio_proxy_openvio,
       {ROAR_VIO_DEF_TYPE_EOL}},
  {ROAR_VIO_DSTR_OBJT_SOCKS4A,    "socks4a",
-      NULL, NULL,
+      roar_vio_proxy_setdef, roar_vio_proxy_openvio,
       {ROAR_VIO_DEF_TYPE_EOL}},
  {ROAR_VIO_DSTR_OBJT_SOCKS4D,    "socks4d",
-      NULL, NULL,
+      roar_vio_proxy_setdef, roar_vio_proxy_openvio,
       {ROAR_VIO_DEF_TYPE_EOL}},
  {ROAR_VIO_DSTR_OBJT_SOCKS5,     "socks5",
-      NULL, NULL,
+      roar_vio_proxy_setdef, roar_vio_proxy_openvio,
       {ROAR_VIO_DEF_TYPE_EOL}},
  {ROAR_VIO_DSTR_OBJT_SSH,        "ssh",
-      NULL, NULL,
+      roar_vio_proxy_setdef, roar_vio_proxy_openvio,
       {ROAR_VIO_DEF_TYPE_EOL}},
 
@@ -265 +265 @@
                                     int (*openvio)(struct roar_vio_calls      * calls,
                                                    struct roar_vio_calls      * dst,
-                                                   struct roar_vio_dstr_chain * cur)) {
+                                                   struct roar_vio_dstr_chain * cur,
+                                                   struct roar_vio_dstr_chain * next)) {
  struct _roar_vio_dstr_type * ret;
 
@@ -362 +363 @@
  switch (def->type) {
   case ROAR_VIO_DEF_TYPE_NONE:
+    ROAR_DBG("roar_vio_open_default(calls=%p, def=%p, opts='%s'): def->type=%i, dummy open", calls, def, opts, (int)def->type);
    break;
 #ifdef ROAR_HAVE_IO_POSIX
   case ROAR_VIO_DEF_TYPE_FILE:
+    ROAR_DBG("roar_vio_open_default(calls=%p, def=%p, opts='%s'): def->type=%i, file open", calls, def, opts, (int)def->type);
     if ( _open_file(calls, def->d.file, def->o_flags, def->o_mode) == -1 ) {
      ROAR_DBG("roar_vio_open_default(*): Can not open file: %i", roar_error);
@@ -372 +375 @@
 #endif
   case ROAR_VIO_DEF_TYPE_SOCKET:
+    ROAR_DBG("roar_vio_open_default(calls=%p, def=%p, opts='%s'): def->type=%i, socket open", calls, def, opts, (int)def->type);
      if ( roar_vio_open_def_socket(calls, def, opts) == -1 )
       return -1;
    break;
   case ROAR_VIO_DEF_TYPE_FH:
+    ROAR_DBG("roar_vio_open_default(calls=%p, def=%p, opts='%s'): def->type=%i, fh open", calls, def, opts, (int)def->type);
     if ( roar_vio_open_fh(calls, def->d.fh) == -1 )
      return -1;
    break;
   case ROAR_VIO_DEF_TYPE_SOCKETFH:
+    ROAR_DBG("roar_vio_open_default(calls=%p, def=%p, opts='%s'): def->type=%i, socket fh open", calls, def, opts, (int)def->type);
     if ( roar_vio_open_fh_socket(calls, def->d.fh) == -1 )
      return -1;
    break;
   default:
+    ROAR_DBG("roar_vio_open_default(calls=%p, def=%p, opts='%s') = -1 // error=NOTSUP", calls, def, opts, (int)def->type);
     roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
@@ -849 +856 @@
  }
 
- for (i = 0; (c = &chain[i])->type != ROAR_VIO_DSTR_OBJT_EOL; i++) {
-  ROAR_DBG("roar_vio_dstr_build_chain(*): i=%i, c->type=0x%.4x(%s): need_vio=%i, def->o_flags=%i", i,
-                   c->type & 0xFFFF, roar_vio_dstr_get_name(c->type), c->need_vio, c->def->o_flags);
+ for (i = 0; (c = &(chain[i]))->type != ROAR_VIO_DSTR_OBJT_EOL; i++) {
+  ROAR_DBG("roar_vio_dstr_build_chain(*): i=%i, c->type=0x%.4x(%s): need_vio=%i, def(%p)->o_flags=%i", i,
+                   c->type & 0xFFFF, roar_vio_dstr_get_name(c->type), c->need_vio, c->def, c->def != NULL ? c->def->o_flags : -1);
 
   if ( c->need_vio ) {
@@ -881 +888 @@
 #ifdef ROAR_HAVE_LIBZ
     case ROAR_VIO_DSTR_OBJT_GZIP:
-      //if ( roar_vio_open_gzip(tc, prev, -1) == -1 ) {
       if ( roar_vio_open_zlib(tc, prev, -1, 1) == -1 ) {
        _ret(-1);
@@ -887 +893 @@
      break;
     case ROAR_VIO_DSTR_OBJT_ZLIB:
-      //if ( roar_vio_open_gzip(tc, prev, -1) == -1 ) {
       if ( roar_vio_open_zlib(tc, prev, -1, 0) == -1 ) {
        _ret(-1);
@@ -960 +965 @@
       }
 
-      if ( type->openvio(tc, prev, c) == -1 ) {
+      if ( type->openvio(tc, prev, c, &(chain[i+1])) == -1 ) {
        _ret(-1);
       }